summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 02:37:45 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 02:37:45 +0000
commit81af939f99865071091db5393e87d85fb0f02012 (patch)
treebaeac357d60dbc5286e782bfbc650819a8bb826a /chrome
parent1b157c09daab66d1f322eb47870ca8d3ba70c381 (diff)
downloadchromium_src-81af939f99865071091db5393e87d85fb0f02012.zip
chromium_src-81af939f99865071091db5393e87d85fb0f02012.tar.gz
chromium_src-81af939f99865071091db5393e87d85fb0f02012.tar.bz2
Rename web_contents_view* files to tab_contents_view* to reflect my previous
rename of the classes. Review URL: http://codereview.chromium.org/87009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/app_modal_dialog_gtk.cc2
-rw-r--r--chrome/browser/automation/automation_provider.cc2
-rw-r--r--chrome/browser/browser.cc3
-rw-r--r--chrome/browser/browser.vcproj16
-rw-r--r--chrome/browser/browser_init.cc2
-rwxr-xr-xchrome/browser/extensions/extension_view.cc2
-rw-r--r--chrome/browser/gtk/browser_window_gtk.cc2
-rw-r--r--chrome/browser/sessions/session_restore.cc2
-rw-r--r--chrome/browser/tab_contents/interstitial_page.cc10
-rw-r--r--chrome/browser/tab_contents/render_view_host_delegate_helper.cc2
-rw-r--r--chrome/browser/tab_contents/tab_contents_view.cc (renamed from chrome/browser/tab_contents/web_contents_view.cc)4
-rw-r--r--chrome/browser/tab_contents/tab_contents_view.h (renamed from chrome/browser/tab_contents/web_contents_view.h)6
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_gtk.cc (renamed from chrome/browser/tab_contents/web_contents_view_gtk.cc)2
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_gtk.h (renamed from chrome/browser/tab_contents/web_contents_view_gtk.h)8
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.h (renamed from chrome/browser/tab_contents/web_contents_view_mac.h)8
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_mac.mm (renamed from chrome/browser/tab_contents/web_contents_view_mac.mm)4
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_win.cc (renamed from chrome/browser/tab_contents/web_contents_view_win.cc)4
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_win.h (renamed from chrome/browser/tab_contents/web_contents_view_win.h)8
-rw-r--r--chrome/browser/tab_contents/web_contents.cc8
-rw-r--r--chrome/browser/views/constrained_window_impl.cc2
-rw-r--r--chrome/browser/views/find_bar_win.cc2
-rw-r--r--chrome/browser/views/find_bar_win_unittest.cc2
-rw-r--r--chrome/browser/views/frame/browser_view.cc2
-rw-r--r--chrome/chrome.gyp16
24 files changed, 56 insertions, 63 deletions
diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc
index de8b678..1108762 100644
--- a/chrome/browser/app_modal_dialog_gtk.cc
+++ b/chrome/browser/app_modal_dialog_gtk.cc
@@ -9,7 +9,7 @@
#include "base/logging.h"
#include "base/string_util.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/message_box_flags.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 9823840..cdeea75 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -26,7 +26,7 @@
#include "chrome/browser/ssl/ssl_manager.h"
#include "chrome/browser/ssl/ssl_blocking_page.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/platform_util.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 83cd796..f0d4207 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -32,7 +32,7 @@
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/site_instance.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/l10n_util.h"
@@ -67,7 +67,6 @@
#include "chrome/browser/download/save_package.h"
#include "chrome/browser/options_window.h"
#include "chrome/browser/ssl/ssl_error_info.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
#include "chrome/browser/task_manager.h"
#include "chrome/browser/user_data_manager.h"
#include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index cacc5a3..4433269 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -2314,35 +2314,35 @@
>
</File>
<File
- RelativePath=".\tab_contents\tab_util.cc"
+ RelativePath=".\tab_contents\tab_contents_view.cc"
>
</File>
<File
- RelativePath=".\tab_contents\tab_util.h"
+ RelativePath=".\tab_contents\tab_contents_view.h"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents.cc"
+ RelativePath=".\tab_contents\tab_contents_view_win.cc"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents.h"
+ RelativePath=".\tab_contents\tab_contents_view_win.h"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents_view.cc"
+ RelativePath=".\tab_contents\tab_util.cc"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents_view.h"
+ RelativePath=".\tab_contents\tab_util.h"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents_view_win.cc"
+ RelativePath=".\tab_contents\web_contents.cc"
>
</File>
<File
- RelativePath=".\tab_contents\web_contents_view_win.h"
+ RelativePath=".\tab_contents\web_contents.h"
>
</File>
<File
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 7f87d6c..0bfc99e 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -26,7 +26,7 @@
#include "chrome/browser/tab_contents/infobar_delegate.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/extensions/extension_view.cc b/chrome/browser/extensions/extension_view.cc
index 8fe6baa..960765a 100755
--- a/chrome/browser/extensions/extension_view.cc
+++ b/chrome/browser/extensions/extension_view.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/tab_contents/site_instance.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc
index 78c87b0..f8277cc 100644
--- a/chrome/browser/gtk/browser_window_gtk.cc
+++ b/chrome/browser/gtk/browser_window_gtk.cc
@@ -30,7 +30,7 @@
#include "chrome/browser/location_bar.h"
#include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/notification_service.h"
#include "chrome/common/pref_names.h"
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index f05a444..b37ecc9 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -15,7 +15,7 @@
#include "chrome/browser/sessions/session_types.h"
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/notification_registrar.h"
#include "chrome/common/notification_service.h"
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index b7c24b2..6f32c76 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/tab_contents/navigation_controller.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/notification_service.h"
#include "chrome/views/window/window_delegate.h"
#include "grit/browser_resources.h"
@@ -258,16 +258,16 @@ RenderViewHost* InterstitialPage::CreateRenderViewHost() {
}
TabContentsView* InterstitialPage::CreateTabContentsView() {
- TabContentsView* web_contents_view = tab()->view();
+ TabContentsView* tab_contents_view = tab()->view();
RenderWidgetHostView* view =
- web_contents_view->CreateViewForWidget(render_view_host_);
+ tab_contents_view->CreateViewForWidget(render_view_host_);
render_view_host_->set_view(view);
render_view_host_->AllowDomAutomationBindings();
render_view_host_->CreateRenderView();
- view->SetSize(web_contents_view->GetContainerSize());
+ view->SetSize(tab_contents_view->GetContainerSize());
// Don't show the interstitial until we have navigated to it.
view->Hide();
- return web_contents_view;
+ return tab_contents_view;
}
void InterstitialPage::Proceed() {
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
index 5dd3c17..49fe017 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.cc
@@ -14,7 +14,7 @@
#include "chrome/browser/renderer_host/render_widget_host_view.h"
#include "chrome/browser/tab_contents/site_instance.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_service.h"
diff --git a/chrome/browser/tab_contents/web_contents_view.cc b/chrome/browser/tab_contents/tab_contents_view.cc
index df61486..326e20f 100644
--- a/chrome/browser/tab_contents/web_contents_view.cc
+++ b/chrome/browser/tab_contents/tab_contents_view.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/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/browser/renderer_host/render_widget_host.h"
@@ -10,7 +10,7 @@
#include "chrome/browser/tab_contents/tab_contents_delegate.h"
#include "chrome/browser/tab_contents/web_contents.h"
-TabContentsView::TabContentsView(WebContents* web_contents)
+TabContentsView::TabContentsView(WebContents* web_contents)
: web_contents_(web_contents) {
}
diff --git a/chrome/browser/tab_contents/web_contents_view.h b/chrome/browser/tab_contents/tab_contents_view.h
index 875a6f6..2a17dff 100644
--- a/chrome/browser/tab_contents/web_contents_view.h
+++ b/chrome/browser/tab_contents/tab_contents_view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
#include <map>
#include <string>
@@ -177,4 +177,4 @@ class TabContentsView : public RenderViewHostDelegate::View {
DISALLOW_COPY_AND_ASSIGN(TabContentsView);
};
-#endif // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_H_
+#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_H_
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index d6d5f12..7262d19 100644
--- a/chrome/browser/tab_contents/web_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.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/web_contents_view_gtk.h"
+#include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
diff --git a/chrome/browser/tab_contents/web_contents_view_gtk.h b/chrome/browser/tab_contents/tab_contents_view_gtk.h
index 773a032..94c60c4 100644
--- a/chrome/browser/tab_contents/web_contents_view_gtk.h
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
#include "base/scoped_ptr.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/owned_widget_gtk.h"
class RenderViewContextMenuGtk;
@@ -79,4 +79,4 @@ class TabContentsViewGtk : public TabContentsView {
DISALLOW_COPY_AND_ASSIGN(TabContentsViewGtk);
};
-#endif // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_GTK_H_
+#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.h b/chrome/browser/tab_contents/tab_contents_view_mac.h
index 9819fd5..920fd76 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.h
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
#import <Cocoa/Cocoa.h>
@@ -11,7 +11,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_nsobject.h"
#include "chrome/browser/cocoa/base_view.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/notification_registrar.h"
class FindBarMac;
@@ -102,4 +102,4 @@ class TabContentsViewMac : public TabContentsView,
DISALLOW_COPY_AND_ASSIGN(TabContentsViewMac);
};
-#endif // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_MAC_H_
+#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_MAC_H_
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 76b8056..291c73c 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -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/web_contents_view_mac.h"
+#include "chrome/browser/tab_contents/tab_contents_view_mac.h"
#include "chrome/browser/browser.h" // TODO(beng): this dependency is awful.
#include "chrome/browser/cocoa/sad_tab_view.h"
@@ -102,7 +102,7 @@ void TabContentsViewMac::Invalidate() {
}
void TabContentsViewMac::SizeContents(const gfx::Size& size) {
- // TODO(brettw) this is a hack and should be removed. See web_contents_view.h.
+ // TODO(brettw) this is a hack and should be removed. See tab_contents_view.h.
NOTIMPLEMENTED(); // Leaving the hack unimplemented.
}
diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc
index c2ab996..3278c60 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_win.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/web_contents_view_win.h"
+#include "chrome/browser/tab_contents/tab_contents_view_win.h"
#include <windows.h>
@@ -225,7 +225,7 @@ void TabContentsViewWin::Invalidate() {
}
void TabContentsViewWin::SizeContents(const gfx::Size& size) {
- // TODO(brettw) this is a hack and should be removed. See web_contents_view.h.
+ // TODO(brettw) this is a hack and should be removed. See tab_contents_view.h.
WasSized(size);
}
diff --git a/chrome/browser/tab_contents/web_contents_view_win.h b/chrome/browser/tab_contents/tab_contents_view_win.h
index 08b8310..227dfa5 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.h
+++ b/chrome/browser/tab_contents/tab_contents_view_win.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
-#define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
+#define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
#include "base/gfx/size.h"
#include "base/scoped_ptr.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/views/widget/widget_win.h"
class SadTabView;
@@ -105,4 +105,4 @@ class TabContentsViewWin : public TabContentsView,
DISALLOW_COPY_AND_ASSIGN(TabContentsViewWin);
};
-#endif // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_VIEW_WIN_H_
+#endif // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 0aa3863..caa49417 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -35,7 +35,7 @@
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/provisional_load_details.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/l10n_util.h"
#include "chrome/common/notification_service.h"
@@ -61,12 +61,6 @@
#include "grit/generated_resources.h"
-#if !defined(OS_MACOSX)
-// TODO(port): port this to mac.
-#include "chrome/browser/renderer_host/render_widget_host_view.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
-#endif
-
// Cross-Site Navigations
//
// If a WebContents is told to navigate to a different web site (as determined
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 95bfd91..bd58c47 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -10,7 +10,7 @@
#include "chrome/browser/profile.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/toolbar_model.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/window_sizer.h"
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index af07227..c60e998 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -13,7 +13,7 @@
#include "chrome/browser/views/find_bar_view.h"
#include "chrome/browser/views/frame/browser_view.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/views/focus/external_focus_tracker.h"
#include "chrome/views/focus/view_storage.h"
#include "chrome/views/controls/scrollbar/native_scroll_bar.h"
diff --git a/chrome/browser/views/find_bar_win_unittest.cc b/chrome/browser/views/find_bar_win_unittest.cc
index 4d30d7c..2d50ff2 100644
--- a/chrome/browser/views/find_bar_win_unittest.cc
+++ b/chrome/browser/views/find_bar_win_unittest.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/renderer_host/render_view_host.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/views/find_bar_win.h"
#include "chrome/common/notification_service.h"
#include "chrome/test/in_process_browser_test.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 2cd0823..6cee57d 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -41,7 +41,7 @@
#include "chrome/browser/sessions/tab_restore_service.h"
#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/browser/tab_contents/web_contents.h"
-#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/tab_contents_view.h"
#include "chrome/browser/window_sizer.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/drag_drop_types.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d707037..88c545c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1098,18 +1098,18 @@
'browser/tab_contents/tab_contents.cc',
'browser/tab_contents/tab_contents.h',
'browser/tab_contents/tab_contents_delegate.h',
+ 'browser/tab_contents/tab_contents_view.cc',
+ 'browser/tab_contents/tab_contents_view.h',
+ 'browser/tab_contents/tab_contents_view_gtk.cc',
+ 'browser/tab_contents/tab_contents_view_gtk.h',
+ 'browser/tab_contents/tab_contents_view_mac.h',
+ 'browser/tab_contents/tab_contents_view_mac.mm',
+ 'browser/tab_contents/tab_contents_view_win.cc',
+ 'browser/tab_contents/tab_contents_view_win.h',
'browser/tab_contents/tab_util.cc',
'browser/tab_contents/tab_util.h',
'browser/tab_contents/web_contents.cc',
'browser/tab_contents/web_contents.h',
- 'browser/tab_contents/web_contents_view.cc',
- 'browser/tab_contents/web_contents_view.h',
- 'browser/tab_contents/web_contents_view_gtk.cc',
- 'browser/tab_contents/web_contents_view_gtk.h',
- 'browser/tab_contents/web_contents_view_mac.h',
- 'browser/tab_contents/web_contents_view_mac.mm',
- 'browser/tab_contents/web_contents_view_win.cc',
- 'browser/tab_contents/web_contents_view_win.h',
'browser/tab_contents/web_drag_source.cc',
'browser/tab_contents/web_drag_source.h',
'browser/tab_contents/web_drop_target.cc',