| Index: content/browser/tab_contents/tab_contents_view_helper.cc
|
| diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/content/browser/tab_contents/tab_contents_view_helper.cc
|
| similarity index 89%
|
| rename from chrome/browser/tab_contents/render_view_host_delegate_helper.cc
|
| rename to content/browser/tab_contents/tab_contents_view_helper.cc
|
| index 451e7b9c7563e33b40daded1c0b3ceb4b4f3fc99..3d434d44e5a28deca339a99ec7f2d5cceef3be23 100644
|
| --- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
|
| +++ b/content/browser/tab_contents/tab_contents_view_helper.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
|
| +#include "content/browser/tab_contents/tab_contents_view_helper.h"
|
|
|
| #include "content/browser/renderer_host/render_view_host.h"
|
| #include "content/browser/renderer_host/render_widget_host.h"
|
| @@ -18,15 +18,15 @@
|
|
|
| using content::WebContents;
|
|
|
| -RenderViewHostDelegateViewHelper::RenderViewHostDelegateViewHelper() {
|
| +TabContentsViewHelper::TabContentsViewHelper() {
|
| registrar_.Add(this,
|
| content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
|
| content::NotificationService::AllBrowserContextsAndSources());
|
| }
|
|
|
| -RenderViewHostDelegateViewHelper::~RenderViewHostDelegateViewHelper() {}
|
| +TabContentsViewHelper::~TabContentsViewHelper() {}
|
|
|
| -void RenderViewHostDelegateViewHelper::Observe(
|
| +void TabContentsViewHelper::Observe(
|
| int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) {
|
| @@ -41,7 +41,7 @@ void RenderViewHostDelegateViewHelper::Observe(
|
| }
|
| }
|
|
|
| -TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
|
| +TabContents* TabContentsViewHelper::CreateNewWindow(
|
| WebContents* web_contents,
|
| int route_id,
|
| const ViewHostMsg_CreateWindow_Params& params) {
|
| @@ -85,7 +85,7 @@ TabContents* RenderViewHostDelegateViewHelper::CreateNewWindow(
|
| return new_contents;
|
| }
|
|
|
| -RenderWidgetHostView* RenderViewHostDelegateViewHelper::CreateNewWidget(
|
| +RenderWidgetHostView* TabContentsViewHelper::CreateNewWidget(
|
| WebContents* web_contents,
|
| int route_id,
|
| bool is_fullscreen,
|
| @@ -103,7 +103,7 @@ RenderWidgetHostView* RenderViewHostDelegateViewHelper::CreateNewWidget(
|
| return widget_view;
|
| }
|
|
|
| -TabContents* RenderViewHostDelegateViewHelper::GetCreatedWindow(int route_id) {
|
| +TabContents* TabContentsViewHelper::GetCreatedWindow(int route_id) {
|
| PendingContents::iterator iter = pending_contents_.find(route_id);
|
|
|
| // Certain systems can block the creation of new windows. If we didn't succeed
|
| @@ -124,8 +124,7 @@ TabContents* RenderViewHostDelegateViewHelper::GetCreatedWindow(int route_id) {
|
| return new_contents;
|
| }
|
|
|
| -RenderWidgetHostView* RenderViewHostDelegateViewHelper::GetCreatedWidget(
|
| - int route_id) {
|
| +RenderWidgetHostView* TabContentsViewHelper::GetCreatedWidget(int route_id) {
|
| PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id);
|
| if (iter == pending_widget_views_.end()) {
|
| DCHECK(false);
|
| @@ -144,7 +143,7 @@ RenderWidgetHostView* RenderViewHostDelegateViewHelper::GetCreatedWidget(
|
| return widget_host_view;
|
| }
|
|
|
| -TabContents* RenderViewHostDelegateViewHelper::ShowCreatedWindow(
|
| +TabContents* TabContentsViewHelper::ShowCreatedWindow(
|
| WebContents* web_contents,
|
| int route_id,
|
| WindowOpenDisposition disposition,
|
| @@ -160,7 +159,7 @@ TabContents* RenderViewHostDelegateViewHelper::ShowCreatedWindow(
|
| return contents;
|
| }
|
|
|
| -RenderWidgetHostView* RenderViewHostDelegateViewHelper::ShowCreatedWidget(
|
| +RenderWidgetHostView* TabContentsViewHelper::ShowCreatedWidget(
|
| WebContents* web_contents,
|
| int route_id,
|
| bool is_fullscreen,
|
|
|