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

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

Issue 2921823002: Rationalize WakeLock naming conventions (Closed)
Patch Set: fix Mac compile error Created 3 years, 7 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 e71d078ca6b91171c2f33b5ad4d1008640cdb61a..91947881cf7c58c0c35dd9b3ed3378eb88d8287c 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -45,7 +45,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_service.mojom.h"
+#include "device/wake_lock/public/interfaces/wake_lock.mojom.h"
#include "net/base/load_states.h"
#include "net/http/http_response_headers.h"
#include "ppapi/features/features.h"
@@ -520,7 +520,7 @@ class CONTENT_EXPORT WebContentsImpl
int browser_plugin_instance_id) override;
device::GeolocationServiceContext* GetGeolocationServiceContext() override;
device::mojom::WakeLockContext* GetWakeLockContext() override;
- device::mojom::WakeLockService* GetRendererWakeLock() override;
+ device::mojom::WakeLock* GetRendererWakeLock() override;
#if defined(OS_ANDROID)
void GetNFC(device::mojom::NFCRequest request) override;
#endif
@@ -1533,7 +1533,7 @@ class CONTENT_EXPORT WebContentsImpl
std::unique_ptr<WakeLockContextHost> wake_lock_context_host_;
- device::mojom::WakeLockServicePtr renderer_wake_lock_;
+ device::mojom::WakeLockPtr renderer_wake_lock_;
#if defined(OS_ANDROID)
std::unique_ptr<NFCHost> nfc_host_;

Powered by Google App Engine
This is Rietveld 408576698