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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 2734943003: Device Service: Decouple Wake Lock from //content (Closed)
Patch Set: Response to review + rebase Created 3 years, 9 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/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index be6e06bdb191da3e253eddf6040290f8eb999c20..c9e9b83a58badc38550e677abd35b5e08f0ce1e1 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -31,6 +31,7 @@
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_view_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h"
+#include "content/browser/wake_lock/wake_lock_context_host.h"
#include "content/common/accessibility_mode.h"
#include "content/common/content_export.h"
#include "content/public/browser/color_chooser.h"
@@ -42,6 +43,7 @@
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/resource_type.h"
#include "content/public/common/three_d_api_types.h"
+#include "device/wake_lock/public/interfaces/wake_lock_context.mojom.h"
#include "net/base/load_states.h"
#include "net/http/http_response_headers.h"
#include "ppapi/features/features.h"
@@ -77,7 +79,6 @@ class ScreenOrientationProvider;
class SiteInstance;
class TestWebContents;
class TextInputManager;
-class WakeLockServiceContext;
class WebContentsAudioMuter;
class WebContentsBindingSet;
class WebContentsDelegate;
@@ -483,7 +484,7 @@ class CONTENT_EXPORT WebContentsImpl
RenderFrameHost* render_frame_host,
int browser_plugin_instance_id) override;
device::GeolocationServiceContext* GetGeolocationServiceContext() override;
- device::WakeLockServiceContext* GetWakeLockServiceContext() override;
+ device::mojom::WakeLockContext* GetWakeLockServiceContext() override;
void EnterFullscreenMode(const GURL& origin) override;
void ExitFullscreenMode(bool will_cause_resize) override;
bool ShouldRouteMessageEvent(
@@ -1466,7 +1467,7 @@ class CONTENT_EXPORT WebContentsImpl
std::unique_ptr<device::GeolocationServiceContext>
geolocation_service_context_;
- std::unique_ptr<device::WakeLockServiceContext> wake_lock_service_context_;
+ std::unique_ptr<WakeLockContextHost> wake_lock_context_host_;
std::unique_ptr<ScreenOrientationProvider> screen_orientation_provider_;

Powered by Google App Engine
This is Rietveld 408576698