| commit | f50445a583e4b7f5f4c865a061c83a4d7b57e5c5 | [log] [tgz] |
|---|---|---|
| author | alogvinov <[email protected]> | Fri Oct 30 13:00:12 2015 |
| committer | Commit bot <[email protected]> | Fri Oct 30 13:00:54 2015 |
| tree | 6cee025d8cf5c89b07f00819e47561744370c522 | |
| parent | 8d3be002af4236d2a3cbd9f7687c78f275dcc2f1 [diff] [blame] |
Reland of Wake Lock API implementation (Chromium part) Original issue: https://codereview.chromium.org/1107333002/ Original issue description: Wake Lock API implementation (Chromium part) This is Chromium part of Wake Lock API implementation as per specification: http://www.w3.org/TR/wake-lock/ The corresponding Blink part is submitted in issue 1084923002 Design document: https://docs.google.com/document/d/1KbIENP0wgxtSXDQFn9PbHZ_tAKZfR1Y8u4Hst8LpeaA/edit?usp=sharing [email protected] [email protected] [email protected] [email protected] BUG=257511 Review URL: https://codereview.chromium.org/1393203004 Cr-Commit-Position: refs/heads/master@{#357087}
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 108f8e92..e01a4d5 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -58,6 +58,7 @@ #include "content/browser/renderer_host/render_widget_host_view_base.h" #include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h" #include "content/browser/site_instance_impl.h" +#include "content/browser/wake_lock/wake_lock_service_context.h" #include "content/browser/web_contents/web_contents_view_guest.h" #include "content/browser/webui/generic_handler.h" #include "content/browser/webui/web_ui_controller_factory_registry.h" @@ -421,6 +422,8 @@ #if defined(ENABLE_BROWSER_CDMS) media_web_contents_observer_.reset(new MediaWebContentsObserver(this)); #endif + + wake_lock_service_context_.reset(new WakeLockServiceContext(this)); } WebContentsImpl::~WebContentsImpl() { @@ -2090,6 +2093,10 @@ return geolocation_service_context_.get(); } +WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() { + return wake_lock_service_context_.get(); +} + void WebContentsImpl::OnShowValidationMessage( const gfx::Rect& anchor_in_root_view, const base::string16& main_text,