| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/tab_contents/tab_contents_view_helper.h" | 5 #include "content/browser/tab_contents/tab_contents_view_helper.h" |
| 6 | 6 |
| 7 #include "content/browser/renderer_host/render_view_host.h" | 7 #include "content/browser/renderer_host/render_view_host.h" |
| 8 #include "content/browser/renderer_host/render_widget_host.h" | 8 #include "content/browser/renderer_host/render_widget_host.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_view.h" | |
| 10 #include "content/browser/tab_contents/tab_contents.h" | 9 #include "content/browser/tab_contents/tab_contents.h" |
| 11 #include "content/common/view_messages.h" | 10 #include "content/common/view_messages.h" |
| 11 #include "content/port/browser/render_widget_host_view_port.h" |
| 12 #include "content/public/browser/notification_service.h" | 12 #include "content/public/browser/notification_service.h" |
| 13 #include "content/public/browser/notification_source.h" | 13 #include "content/public/browser/notification_source.h" |
| 14 #include "content/public/browser/notification_types.h" | 14 #include "content/public/browser/notification_types.h" |
| 15 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 16 #include "content/public/browser/web_contents_delegate.h" | 16 #include "content/public/browser/web_contents_delegate.h" |
| 17 #include "content/public/browser/web_contents_view.h" | 17 #include "content/public/browser/web_contents_view.h" |
| 18 | 18 |
| 19 using content::RenderWidgetHostView; |
| 19 using content::RenderWidgetHostViewPort; | 20 using content::RenderWidgetHostViewPort; |
| 20 using content::WebContents; | 21 using content::WebContents; |
| 21 | 22 |
| 22 TabContentsViewHelper::TabContentsViewHelper() { | 23 TabContentsViewHelper::TabContentsViewHelper() { |
| 23 registrar_.Add(this, | 24 registrar_.Add(this, |
| 24 content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, | 25 content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, |
| 25 content::NotificationService::AllBrowserContextsAndSources()); | 26 content::NotificationService::AllBrowserContextsAndSources()); |
| 26 } | 27 } |
| 27 | 28 |
| 28 TabContentsViewHelper::~TabContentsViewHelper() {} | 29 TabContentsViewHelper::~TabContentsViewHelper() {} |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 RenderWidgetHostViewPort::FromRWHV(GetCreatedWidget(route_id)); | 173 RenderWidgetHostViewPort::FromRWHV(GetCreatedWidget(route_id)); |
| 173 if (is_fullscreen) { | 174 if (is_fullscreen) { |
| 174 widget_host_view->InitAsFullscreen(web_contents->GetRenderWidgetHostView()); | 175 widget_host_view->InitAsFullscreen(web_contents->GetRenderWidgetHostView()); |
| 175 } else { | 176 } else { |
| 176 widget_host_view->InitAsPopup(web_contents->GetRenderWidgetHostView(), | 177 widget_host_view->InitAsPopup(web_contents->GetRenderWidgetHostView(), |
| 177 initial_pos); | 178 initial_pos); |
| 178 } | 179 } |
| 179 widget_host_view->GetRenderWidgetHost()->Init(); | 180 widget_host_view->GetRenderWidgetHost()->Init(); |
| 180 return widget_host_view; | 181 return widget_host_view; |
| 181 } | 182 } |
| OLD | NEW |