| Index: content/browser/web_contents/web_contents_view_helper.cc
|
| diff --git a/content/browser/tab_contents/tab_contents_view_helper.cc b/content/browser/web_contents/web_contents_view_helper.cc
|
| similarity index 93%
|
| rename from content/browser/tab_contents/tab_contents_view_helper.cc
|
| rename to content/browser/web_contents/web_contents_view_helper.cc
|
| index beaae80fa8fab1ff4936ca108c13f53933192bee..5334f3c40b8fdd66d8702552fe5ca500c35df3bf 100644
|
| --- a/content/browser/tab_contents/tab_contents_view_helper.cc
|
| +++ b/content/browser/web_contents/web_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 "content/browser/tab_contents/tab_contents_view_helper.h"
|
| +#include "content/browser/web_contents/web_contents_view_helper.h"
|
|
|
| #include "content/browser/renderer_host/render_view_host_impl.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| @@ -23,15 +23,15 @@ using content::RenderWidgetHostView;
|
| using content::RenderWidgetHostViewPort;
|
| using content::WebContents;
|
|
|
| -TabContentsViewHelper::TabContentsViewHelper() {
|
| +WebContentsViewHelper::WebContentsViewHelper() {
|
| registrar_.Add(this,
|
| content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
|
| content::NotificationService::AllBrowserContextsAndSources());
|
| }
|
|
|
| -TabContentsViewHelper::~TabContentsViewHelper() {}
|
| +WebContentsViewHelper::~WebContentsViewHelper() {}
|
|
|
| -void TabContentsViewHelper::Observe(
|
| +void WebContentsViewHelper::Observe(
|
| int type,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) {
|
| @@ -46,7 +46,7 @@ void TabContentsViewHelper::Observe(
|
| }
|
| }
|
|
|
| -TabContents* TabContentsViewHelper::CreateNewWindow(
|
| +TabContents* WebContentsViewHelper::CreateNewWindow(
|
| WebContents* web_contents,
|
| int route_id,
|
| const ViewHostMsg_CreateWindow_Params& params) {
|
| @@ -122,7 +122,7 @@ TabContents* TabContentsViewHelper::CreateNewWindow(
|
| return new_contents;
|
| }
|
|
|
| -RenderWidgetHostView* TabContentsViewHelper::CreateNewWidget(
|
| +RenderWidgetHostView* WebContentsViewHelper::CreateNewWidget(
|
| WebContents* web_contents,
|
| int route_id,
|
| bool is_fullscreen,
|
| @@ -141,7 +141,7 @@ RenderWidgetHostView* TabContentsViewHelper::CreateNewWidget(
|
| return widget_view;
|
| }
|
|
|
| -TabContents* TabContentsViewHelper::GetCreatedWindow(int route_id) {
|
| +TabContents* WebContentsViewHelper::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
|
| @@ -162,7 +162,7 @@ TabContents* TabContentsViewHelper::GetCreatedWindow(int route_id) {
|
| return new_contents;
|
| }
|
|
|
| -RenderWidgetHostView* TabContentsViewHelper::GetCreatedWidget(int route_id) {
|
| +RenderWidgetHostView* WebContentsViewHelper::GetCreatedWidget(int route_id) {
|
| PendingWidgetViews::iterator iter = pending_widget_views_.find(route_id);
|
| if (iter == pending_widget_views_.end()) {
|
| DCHECK(false);
|
| @@ -181,7 +181,7 @@ RenderWidgetHostView* TabContentsViewHelper::GetCreatedWidget(int route_id) {
|
| return widget_host_view;
|
| }
|
|
|
| -TabContents* TabContentsViewHelper::ShowCreatedWindow(
|
| +TabContents* WebContentsViewHelper::ShowCreatedWindow(
|
| WebContents* web_contents,
|
| int route_id,
|
| WindowOpenDisposition disposition,
|
| @@ -197,7 +197,7 @@ TabContents* TabContentsViewHelper::ShowCreatedWindow(
|
| return contents;
|
| }
|
|
|
| -RenderWidgetHostView* TabContentsViewHelper::ShowCreatedWidget(
|
| +RenderWidgetHostView* WebContentsViewHelper::ShowCreatedWidget(
|
| WebContents* web_contents,
|
| int route_id,
|
| bool is_fullscreen,
|
|
|