Revert of Aura on Android: content/browser (patchset #9 id:160001 of https://codereview.chromium.org/1411503005/ )
Reason for revert:
Reverting, since Android Aura has been cancelled.
Original issue's description:
> Aura on Android: content/browser
>
> Changes necessary to get content/browser, content/public/browser, and content/child GN targets to build.
>
> BUG=507792
>
> Committed: https://crrev.com/841f818387cab380b6b21158ad94c9b256bb9c32
> Cr-Commit-Position: refs/heads/master@{#358496}
[email protected],[email protected],[email protected],[email protected]
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=507792
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
Review URL: https://codereview.chromium.org/1649483002
Cr-Commit-Position: refs/heads/master@{#372136}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 2612caf..3eaba069 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -123,14 +123,11 @@
#if defined(OS_ANDROID)
#include "content/browser/android/content_video_view.h"
+#include "content/browser/android/date_time_chooser_android.h"
#include "content/browser/media/android/media_session.h"
#include "content/browser/media/android/media_web_contents_observer_android.h"
-#endif // OS_ANDROID
-
-#if defined(OS_ANDROID) && !defined(USE_AURA)
-#include "content/browser/android/date_time_chooser_android.h"
#include "content/browser/web_contents/web_contents_android.h"
-#endif // OS_ANDROID && !USE_AURA
+#endif // OS_ANDROID
#if defined(OS_MACOSX)
#include "base/mac/foundation_util.h"
@@ -680,7 +677,7 @@
OnHideValidationMessage)
IPC_MESSAGE_HANDLER(ViewHostMsg_MoveValidationMessage,
OnMoveValidationMessage)
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
IPC_MESSAGE_HANDLER(FrameHostMsg_FindMatchRects_Reply,
OnFindMatchRectsReply)
IPC_MESSAGE_HANDLER(ViewHostMsg_OpenDateTimeDialog,
@@ -1434,7 +1431,7 @@
manifest_manager_host_.reset(new ManifestManagerHost(this));
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
date_time_chooser_.reset(new DateTimeChooserAndroid());
#endif
@@ -3365,7 +3362,7 @@
}
}
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
void WebContentsImpl::OnFindMatchRectsReply(
int version,
const std::vector<gfx::RectF>& rects,
@@ -4577,7 +4574,7 @@
return true;
}
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
base::android::ScopedJavaLocalRef<jobject>
WebContentsImpl::GetJavaWebContents() {
