Chromium Code Reviews| 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 8fafdaeb59cce21eb0bde46d2e6f87fbeb6b1e2d..b89a94dedce8464821861b805dc4d5188e138f3a 100644 |
| --- a/content/browser/web_contents/web_contents_impl.cc |
| +++ b/content/browser/web_contents/web_contents_impl.cc |
| @@ -70,7 +70,7 @@ |
| #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/screen_orientation/screen_orientation_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 +102,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" |
| @@ -468,6 +468,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_.reset(new ScreenOrientationImpl(this)); |
| } |
| WebContentsImpl::~WebContentsImpl() { |
| @@ -1586,9 +1587,6 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { |
| NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, |
| NotificationService::AllBrowserContextsAndSources()); |
| - screen_orientation_dispatcher_host_.reset( |
|
blundell
2016/10/21 18:16:31
Is there a reason that you moved where this object
lunalu1
2016/10/24 16:57:36
Done.
|
| - new ScreenOrientationDispatcherHostImpl(this)); |
| - |
| manifest_manager_host_.reset(new ManifestManagerHost(this)); |
| #if defined(OS_ANDROID) |
| @@ -2398,6 +2396,10 @@ device::WakeLockServiceContext* WebContentsImpl::GetWakeLockServiceContext() { |
| return wake_lock_service_context_.get(); |
| } |
| +ScreenOrientationImpl* WebContentsImpl::GetScreenOrientation() { |
| + return screen_orientation_.get(); |
| +} |
| + |
| void WebContentsImpl::OnShowValidationMessage( |
| const gfx::Rect& anchor_in_root_view, |
| const base::string16& main_text, |