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

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

Issue 2734943003: Device Service: Decouple Wake Lock from //content (Closed)
Patch Set: Response to reviews 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.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index d8bdf2f26bda627ec589ecf4d6eb7989e2938b69..2a5952ddeb74d351703efaf520f70a158d5c0971 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -125,7 +125,6 @@
#include "content/public/common/web_preferences.h"
#include "device/geolocation/geolocation_service_context.h"
#include "device/nfc/nfc.mojom.h"
-#include "device/wake_lock/wake_lock_service_context.h"
#include "net/base/url_util.h"
#include "net/http/http_cache.h"
#include "net/http/http_transaction_factory.h"
@@ -480,10 +479,9 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
#if BUILDFLAG(ENABLE_PLUGINS)
pepper_playback_observer_.reset(new PepperPlaybackObserver(this));
#endif
+
+ wake_lock_context_host_.reset(new WakeLockContextHost(this));
loader_io_thread_notifier_.reset(new LoaderIOThreadNotifier(this));
- wake_lock_service_context_.reset(new device::WakeLockServiceContext(
- BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
- base::Bind(&WebContentsImpl::GetNativeView, base::Unretained(this))));
host_zoom_map_observer_.reset(new HostZoomMapObserver(this));
}
@@ -2475,8 +2473,8 @@ WebContentsImpl::GetGeolocationServiceContext() {
return geolocation_service_context_.get();
}
-device::WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() {
- return wake_lock_service_context_.get();
+device::mojom::WakeLockContext* WebContentsImpl::GetWakeLockServiceContext() {
+ return wake_lock_context_host_->GetWakeLockContext();
}
void WebContentsImpl::OnShowValidationMessage(

Powered by Google App Engine
This is Rietveld 408576698