Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1324)

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2389743002: Content Modularization Project: Move Wake Lock to //device (Closed)
Patch Set: Eliminate frame reference Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_host_impl.cc
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 88daf80dcaf5e3e2f22c8a3f7fa8f47575df62f8..7d4bbb744d8e2284e35c8425bbc5a291d3ea0faf 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -49,7 +49,6 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
#include "content/browser/shared_worker/shared_worker_service_impl.h"
-#include "content/browser/wake_lock/wake_lock_service_context.h"
#include "content/browser/websockets/websocket_manager.h"
#include "content/browser/webui/web_ui_controller_factory_registry.h"
#include "content/common/accessibility_messages.h"
@@ -87,6 +86,7 @@
#include "device/generic_sensor/sensor_provider_impl.h"
#include "device/geolocation/geolocation_service_context.h"
#include "device/vibration/vibration_manager_impl.h"
+#include "device/wake_lock/wake_lock_service_context.h"
#include "media/mojo/interfaces/media_service.mojom.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
@@ -2125,14 +2125,14 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {
weak_ptr_factory_.GetWeakPtr())));
}
- WakeLockServiceContext* wake_lock_service_context =
+ device::WakeLockServiceContext* wake_lock_service_context =
delegate_ ? delegate_->GetWakeLockServiceContext() : nullptr;
if (wake_lock_service_context) {
// WakeLockServiceContext is owned by WebContentsImpl so it will outlive
// this RenderFrameHostImpl, hence a raw pointer can be bound to service
// factory callback.
- GetInterfaceRegistry()->AddInterface<blink::mojom::WakeLockService>(
- base::Bind(&WakeLockServiceContext::CreateService,
+ GetInterfaceRegistry()->AddInterface<device::mojom::WakeLockService>(
+ base::Bind(&device::WakeLockServiceContext::CreateService,
base::Unretained(wake_lock_service_context)));
}
« no previous file with comments | « content/browser/frame_host/render_frame_host_delegate.cc ('k') | content/browser/wake_lock/wake_lock_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698