| 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 9842629f07d345d10fe57c671e7576deb343bfdd..e2982a4ba11941121dd443b2d99cb89ac3e3d708 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -69,7 +69,6 @@
|
| #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| #include "content/browser/renderer_host/text_input_manager.h"
|
| -#include "content/browser/screen_orientation/screen_orientation_dispatcher_host_impl.h"
|
| #include "content/browser/site_instance_impl.h"
|
| #include "content/browser/web_contents/web_contents_view_child_frame.h"
|
| #include "content/browser/web_contents/web_contents_view_guest.h"
|
| @@ -102,7 +101,7 @@
|
| #include "content/public/browser/notification_types.h"
|
| #include "content/public/browser/render_widget_host_iterator.h"
|
| #include "content/public/browser/resource_request_details.h"
|
| -#include "content/public/browser/screen_orientation_dispatcher_host.h"
|
| +#include "content/public/browser/screen_orientation_provider.h"
|
| #include "content/public/browser/security_style_explanations.h"
|
| #include "content/public/browser/storage_partition.h"
|
| #include "content/public/browser/user_metrics.h"
|
| @@ -465,6 +464,7 @@ WebContentsImpl::WebContentsImpl(BrowserContext* browser_context)
|
| wake_lock_service_context_.reset(new device::WakeLockServiceContext(
|
| BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
|
| base::Bind(&WebContentsImpl::GetNativeView, base::Unretained(this))));
|
| + screen_orientation_provider_.reset(new ScreenOrientationProvider(this));
|
| }
|
|
|
| WebContentsImpl::~WebContentsImpl() {
|
| @@ -1613,9 +1613,6 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
|
| NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
|
| NotificationService::AllBrowserContextsAndSources());
|
|
|
| - screen_orientation_dispatcher_host_.reset(
|
| - new ScreenOrientationDispatcherHostImpl(this));
|
| -
|
| manifest_manager_host_.reset(new ManifestManagerHost(this));
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -2428,6 +2425,10 @@ device::WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() {
|
| return wake_lock_service_context_.get();
|
| }
|
|
|
| +ScreenOrientationProvider* WebContentsImpl::GetScreenOrientationProvider() {
|
| + return screen_orientation_provider_.get();
|
| +}
|
| +
|
| void WebContentsImpl::OnShowValidationMessage(
|
| const gfx::Rect& anchor_in_root_view,
|
| const base::string16& main_text,
|
|
|