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/BUILD.gn b/content/browser/BUILD.gn
index b615d2a..b83884b 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -338,6 +338,10 @@
sources += rebase_path(content_browser_gypi_values.android_browser_sources,
".",
"//content")
+ sources += rebase_path(
+ content_browser_gypi_values.android_in_process_browser_sources,
+ ".",
+ "//content")
sources -= [
"browser_ipc_logging.cc",
"device_sensors/data_fetcher_shared_memory_default.cc",
@@ -347,6 +351,7 @@
"geolocation/network_location_request.h",
"power_usage_monitor_impl.cc",
"power_usage_monitor_impl.h",
+ "renderer_host/begin_frame_observer_proxy.cc",
"tracing/tracing_ui.cc",
"tracing/tracing_ui.h",
@@ -372,19 +377,6 @@
"speech/speech_recognizer_impl.cc",
"speech/speech_recognizer_impl.h",
]
-
- if (!use_aura) {
- sources += rebase_path(
- content_browser_gypi_values.android_non_aura_browser_sources,
- ".",
- "//content")
- sources += rebase_path(
- content_browser_gypi_values.android_in_process_browser_sources,
- ".",
- "//content")
- sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
- }
-
deps -= [ "//device/battery" ]
deps += [
"//content/public/android:jni",
diff --git a/content/browser/accessibility/browser_accessibility_manager.cc b/content/browser/accessibility/browser_accessibility_manager.cc
index 75c0b82..fd4db343 100644
--- a/content/browser/accessibility/browser_accessibility_manager.cc
+++ b/content/browser/accessibility/browser_accessibility_manager.cc
@@ -87,11 +87,7 @@
}
BrowserAccessibility* BrowserAccessibilityFactory::Create() {
-#if defined(OS_ANDROID) && defined(USE_AURA)
- return nullptr;
-#else
return BrowserAccessibility::Create();
-#endif
}
BrowserAccessibilityFindInPageInfo::BrowserAccessibilityFindInPageInfo()
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 5d8a3e9..05e6a377 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -7,20 +7,13 @@
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
#include "base/macros.h"
-#include "content/browser/android/browser_startup_controller.h"
-#include "content/browser/android/child_process_launcher_android.h"
-#include "content/browser/android/content_video_view.h"
-#include "content/browser/media/android/media_resource_getter_impl.h"
-#include "content/browser/media/android/media_session.h"
-#include "content/browser/mojo/service_registrar_android.h"
-#include "content/browser/mojo/service_registry_android.h"
-#include "mojo/android/system/core_impl.h"
-
-#if !defined(USE_AURA)
#include "content/browser/accessibility/browser_accessibility_android.h"
#include "content/browser/accessibility/browser_accessibility_manager_android.h"
#include "content/browser/android/background_sync_network_observer_android.h"
+#include "content/browser/android/browser_startup_controller.h"
+#include "content/browser/android/child_process_launcher_android.h"
#include "content/browser/android/composited_touch_handle_drawable.h"
+#include "content/browser/android/content_video_view.h"
#include "content/browser/android/content_view_core_impl.h"
#include "content/browser/android/content_view_render_view.h"
#include "content/browser/android/content_view_statics.h"
@@ -35,6 +28,10 @@
#include "content/browser/frame_host/navigation_controller_android.h"
#include "content/browser/gamepad/gamepad_platform_data_fetcher_android.h"
#include "content/browser/geolocation/location_api_adapter_android.h"
+#include "content/browser/media/android/media_resource_getter_impl.h"
+#include "content/browser/media/android/media_session.h"
+#include "content/browser/mojo/service_registrar_android.h"
+#include "content/browser/mojo/service_registry_android.h"
#include "content/browser/power_save_blocker_android.h"
#include "content/browser/renderer_host/ime_adapter_android.h"
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
@@ -43,7 +40,7 @@
#include "content/browser/time_zone_monitor_android.h"
#include "content/browser/vr/android/cardboard/cardboard_vr_device.h"
#include "content/browser/web_contents/web_contents_android.h"
-#endif
+#include "mojo/android/system/core_impl.h"
namespace {
base::android::RegistrationMethod kContentRegisteredMethods[] = {
@@ -54,7 +51,6 @@
{"MediaResourceGetterImpl",
content::MediaResourceGetterImpl::RegisterMediaResourceGetter},
{"MediaSession", content::MediaSession::RegisterMediaSession},
-#if !defined(USE_AURA)
{"AndroidLocationApiAdapter",
content::AndroidLocationApiAdapter::RegisterGeolocationService},
{"BackgroundSyncNetworkObserverAndroid",
@@ -101,7 +97,6 @@
{"WebContentsAndroid", content::WebContentsAndroid::Register},
{"WebContentsObserver", content::RegisterWebContentsObserverProxy},
{"WebViewStatics", content::RegisterWebViewStatics},
-#endif // !USE_AURA
};
} // namespace
diff --git a/content/browser/android/child_process_launcher_android.cc b/content/browser/android/child_process_launcher_android.cc
index 471ce31..a396580 100644
--- a/content/browser/android/child_process_launcher_android.cc
+++ b/content/browser/android/child_process_launcher_android.cc
@@ -41,7 +41,6 @@
base::ProcessHandle render_process_handle,
int render_frame_id,
int player_id) {
-#if !defined(USE_AURA)
int render_process_id = 0;
RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
while (!it.IsAtEnd()) {
@@ -83,9 +82,6 @@
gfx::ScopedJavaSurface scoped_surface(surface);
player->SetVideoSurface(std::move(scoped_surface));
}
-#else
- NOTREACHED();
-#endif
}
} // anonymous namespace
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index acda33e..0606bc21 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -80,13 +80,11 @@
switches::kProfilerTiming, switches::kProfilerTimingDisabledValue);
}
-#if !defined(USE_AURA)
cc::LayerSettings layer_settings;
layer_settings.use_compositor_animation_timelines =
!parsed_command_line->HasSwitch(
switches::kDisableAndroidCompositorAnimationTimelines);
Compositor::SetLayerSettings(layer_settings);
-#endif
}
} // namespace content
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 14ba5d4..4b14959 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -7,15 +7,12 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
+#include "content/browser/android/content_view_core_impl.h"
#include "content/browser/media/android/browser_media_player_manager.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/common/content_switches.h"
#include "jni/ContentVideoView_jni.h"
-#if !defined(USE_AURA)
-#include "content/browser/android/content_view_core_impl.h"
-#endif
-
using base::android::AttachCurrentThread;
using base::android::CheckException;
using base::android::ScopedJavaGlobalRef;
@@ -162,12 +159,8 @@
JavaObjectWeakGlobalRef ContentVideoView::CreateJavaObject(
ContentViewCore* content_view_core) {
JNIEnv* env = AttachCurrentThread();
- base::android::ScopedJavaLocalRef<jobject> j_content_view_core;
-
-#if !defined(USE_AURA)
- j_content_view_core = content_view_core->GetJavaObject();
-#endif
-
+ base::android::ScopedJavaLocalRef<jobject> j_content_view_core =
+ content_view_core->GetJavaObject();
if (j_content_view_core.is_null())
return JavaObjectWeakGlobalRef(env, nullptr);
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index d4425cc..f99331394 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -650,7 +650,7 @@
BrowserSurfaceTextureManager::GetInstance());
}
}
-#if !defined(USE_AURA)
+
if (!parsed_command_line_.HasSwitch(
switches::kDisableScreenOrientationLock)) {
TRACE_EVENT0("startup",
@@ -660,7 +660,6 @@
ScreenOrientationProvider::SetDelegate(screen_orientation_delegate_.get());
}
#endif
-#endif
#if defined(OS_MACOSX) && !defined(OS_IOS)
if (BootstrapSandboxManager::ShouldEnable()) {
@@ -1199,7 +1198,7 @@
bool always_uses_gpu = true;
bool established_gpu_channel = false;
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
// TODO(crbug.com/439322): This should be set to |true|.
established_gpu_channel = false;
BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
@@ -1417,7 +1416,7 @@
return trace_file;
if (trace_file.empty()) {
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
#else
// Default to saving the startup trace into the current dir.
@@ -1425,7 +1424,7 @@
#endif
}
} else {
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
TracingControllerAndroid::GenerateTracingFilePath(&trace_file);
#else
trace_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 9ee9ee1..bbf47b0 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -181,7 +181,7 @@
} else if (tracing::TraceConfigFile::GetInstance()->IsEnabled() &&
TracingController::GetInstance()->IsTracing()) {
base::FilePath result_file;
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
TracingControllerAndroid::GenerateTracingFilePath(&result_file);
#else
result_file = tracing::TraceConfigFile::GetInstance()->GetResultFile();
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index fd19c91..eccd9dc 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -122,15 +122,11 @@
scoped_ptr<WebGraphicsContext3DCommandBufferImpl>
GpuProcessTransportFactory::CreateOffscreenCommandBufferContext() {
-#if defined(OS_ANDROID)
- return CreateContextCommon(scoped_refptr<GpuChannelHost>(nullptr), 0);
-#else
CauseForGpuLaunch cause =
CAUSE_FOR_GPU_LAUNCH_WEBGRAPHICSCONTEXT3DCOMMANDBUFFERIMPL_INITIALIZE;
scoped_refptr<GpuChannelHost> gpu_channel_host(
BrowserGpuChannelHostFactory::instance()->EstablishGpuChannelSync(cause));
return CreateContextCommon(gpu_channel_host, 0);
-#endif // OS_ANDROID
}
scoped_ptr<cc::SoftwareOutputDevice>
diff --git a/content/browser/compositor/surface_utils.cc b/content/browser/compositor/surface_utils.cc
index 7ae0591..1049ba2 100644
--- a/content/browser/compositor/surface_utils.cc
+++ b/content/browser/compositor/surface_utils.cc
@@ -7,7 +7,7 @@
#include "build/build_config.h"
#include "cc/surfaces/surface_id_allocator.h"
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
#include "content/browser/renderer_host/compositor_impl_android.h"
#else
#include "content/browser/compositor/image_transport_factory.h"
@@ -17,7 +17,7 @@
namespace content {
scoped_ptr<cc::SurfaceIdAllocator> CreateSurfaceIdAllocator() {
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
return CompositorImpl::CreateSurfaceIdAllocator();
#else
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
@@ -26,7 +26,7 @@
}
cc::SurfaceManager* GetSurfaceManager() {
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
return CompositorImpl::GetSurfaceManager();
#else
ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
index cb1be38e..848c55c 100644
--- a/content/browser/devtools/render_frame_devtools_agent_host.cc
+++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -481,7 +481,7 @@
frame_trace_recorder_.reset(new DevToolsFrameTraceRecorder());
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
power_save_blocker_.reset(static_cast<PowerSaveBlockerImpl*>(
PowerSaveBlocker::Create(
PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index 10a0681..055fae9 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -486,12 +486,8 @@
BrowserAccessibilityManager*
RenderWidgetHostViewChildFrame::CreateBrowserAccessibilityManager(
BrowserAccessibilityDelegate* delegate) {
-#if defined(OS_ANDROID) && defined(USE_AURA)
- return nullptr;
-#else
return BrowserAccessibilityManager::Create(
BrowserAccessibilityManager::GetEmptyDocument(), delegate);
-#endif
}
void RenderWidgetHostViewChildFrame::ClearCompositorSurfaceIfNecessary() {
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc
index 17e8fc5..1123974 100644
--- a/content/browser/media/media_web_contents_observer.cc
+++ b/content/browser/media/media_web_contents_observer.cc
@@ -176,8 +176,7 @@
video_power_save_blocker_ = PowerSaveBlocker::Create(
PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
PowerSaveBlocker::kReasonVideoPlayback, "Playing video");
-// TODO(mfomitchev): Support PowerSaveBlocker on Aura - crbug.com/546718.
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
static_cast<PowerSaveBlockerImpl*>(video_power_save_blocker_.get())
->InitDisplaySleepBlocker(web_contents());
#endif
diff --git a/content/browser/power_save_blocker_impl.cc b/content/browser/power_save_blocker_impl.cc
index b3f15fb..069cd3a3 100644
--- a/content/browser/power_save_blocker_impl.cc
+++ b/content/browser/power_save_blocker_impl.cc
@@ -14,12 +14,8 @@
PowerSaveBlockerType type,
Reason reason,
const std::string& description) {
-#if defined(OS_ANDROID) && defined(USE_AURA)
- return nullptr;
-#else
return scoped_ptr<PowerSaveBlocker>(
new PowerSaveBlockerImpl(type, reason, description));
-#endif
}
} // namespace content
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 90d4f0d..5b87271 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1049,7 +1049,7 @@
AddFilter(new MemoryMessageFilter(this));
AddFilter(new PushMessagingMessageFilter(
GetID(), storage_partition_impl_->GetServiceWorkerContext()));
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
AddFilter(new ScreenOrientationMessageFilterAndroid());
#endif
AddFilter(new GeofencingDispatcherHost(
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 1cd3d57..a824454 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1409,7 +1409,7 @@
#if defined(OS_WIN)
manager = new BrowserAccessibilityManagerWin(
BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
-#elif !defined(OS_ANDROID)
+#else
manager = BrowserAccessibilityManager::Create(
BrowserAccessibilityManager::GetEmptyDocument(), delegate);
#endif
diff --git a/content/browser/wake_lock/wake_lock_service_context.cc b/content/browser/wake_lock/wake_lock_service_context.cc
index a6904c21..2c85874 100644
--- a/content/browser/wake_lock/wake_lock_service_context.cc
+++ b/content/browser/wake_lock/wake_lock_service_context.cc
@@ -65,7 +65,7 @@
PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
PowerSaveBlocker::kReasonOther, "Wake Lock API");
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
// On Android, additionaly associate the blocker with this WebContents.
DCHECK(web_contents());
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() {
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index f0e8b0b..ba9c43b 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -83,7 +83,7 @@
struct ResourceRedirectDetails;
struct ResourceRequestDetails;
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
class WebContentsAndroid;
#endif
@@ -131,7 +131,7 @@
// Returns the SavePackage which manages the page saving job. May be NULL.
SavePackage* save_package() const { return save_package_.get(); }
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
// In Android WebView, the RenderView needs created even there is no
// navigation entry, this allows Android WebViews to use
// javascript: URLs that load into the DOMWindow before the first page
@@ -384,10 +384,9 @@
void ResumeMediaSession() override;
void SuspendMediaSession() override;
void StopMediaSession() override;
-#if !defined(USE_AURA)
+
base::android::ScopedJavaLocalRef<jobject> GetJavaWebContents() override;
virtual WebContentsAndroid* GetWebContentsAndroid();
-#endif // !USE_AURA
#elif defined(OS_MACOSX)
void SetAllowOtherViews(bool allow) override;
bool GetAllowOtherViews() override;
@@ -871,7 +870,7 @@
const gfx::Rect& selection_rect,
int active_match_ordinal,
bool final_update);
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
void OnFindMatchRectsReply(int version,
const std::vector<gfx::RectF>& rects,
const gfx::RectF& active_rect);
@@ -1192,7 +1191,7 @@
// this overrides |preferred_size_|.
gfx::Size preferred_size_for_capture_;
-#if defined(OS_ANDROID) && !defined(USE_AURA)
+#if defined(OS_ANDROID)
// Date time chooser opened by this tab.
// Only used in Android since all other platforms use a multi field UI.
scoped_ptr<DateTimeChooserAndroid> date_time_chooser_;
