Ensure that view_messages.h and tab_contents.h don't get included by any more code. The only remaining place is tab_contents_view_mac.mm. Instead of waiting until it moves, I've moved it to a directory with a DEPS file to allow those includes. That way we can enforce that no new files include those headers. It took a few weeks work to remove all the dependencies, and we don't want them regressing.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9178026

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117962 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 13 insertions, 9 deletions

diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc
index 0476f7d..31cd447 100644
--- a/content/browser/mock_content_browser_client.cc
+++ b/content/browser/mock_content_browser_client.cc
@@ -29,7 +29,7 @@ BrowserMainParts* MockContentBrowserClient::CreateBrowserMainParts(
 }
 
 TabContentsView* MockContentBrowserClient::CreateTabContentsView(
-    TabContents* tab_contents) {
+    WebContents* web_contents) {
   return new TestTabContentsView;
 }
 
diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index 6e47710..ef52b51 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -24,7 +24,7 @@ class MockContentBrowserClient : public ContentBrowserClient {
   virtual BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) OVERRIDE;
   virtual TabContentsView* CreateTabContentsView(
-      TabContents* tab_contents) OVERRIDE;
+      WebContents* web_contents) OVERRIDE;
   virtual void RenderViewHostCreated(
       RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderProcessHostCreated(
diff --git a/content/browser/tab_contents/tab_contents_view_gtk.cc b/content/browser/tab_contents/tab_contents_view_gtk.cc
index ed87863..36681b2 100644
--- a/content/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/content/browser/tab_contents/tab_contents_view_gtk.cc
@@ -78,9 +78,9 @@ gboolean OnMouseScroll(GtkWidget* widget, GdkEventScroll* event,
 namespace content {
 
 TabContentsViewGtk::TabContentsViewGtk(
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     content::TabContentsViewWrapperGtk* view_wrapper)
-    : tab_contents_(tab_contents),
+    : tab_contents_(static_cast<TabContents*>(web_contents)),
       expanded_(gtk_expanded_container_new()),
       view_wrapper_(view_wrapper),
       overlaid_view_(NULL) {
@@ -91,7 +91,7 @@ TabContentsViewGtk::TabContentsViewGtk(
                    G_CALLBACK(OnChildSizeRequestThunk), this);
 
   gtk_widget_show(expanded_.get());
-  drag_source_.reset(new content::WebDragSourceGtk(tab_contents));
+  drag_source_.reset(new content::WebDragSourceGtk(web_contents));
 
   if (view_wrapper_.get())
     view_wrapper_->WrapView(this);
diff --git a/content/browser/tab_contents/tab_contents_view_gtk.h b/content/browser/tab_contents/tab_contents_view_gtk.h
index bafaa8d..ccd3c7d 100644
--- a/content/browser/tab_contents/tab_contents_view_gtk.h
+++ b/content/browser/tab_contents/tab_contents_view_gtk.h
@@ -32,7 +32,8 @@ class CONTENT_EXPORT TabContentsViewGtk : public TabContentsView {
   // because that's what was easiest when they were split. We optionally take
   // |wrapper| which creates an intermediary widget layer for features from the
   // embedding layer that live with the TabContentsView.
-  explicit TabContentsViewGtk(TabContents* tab_contents,
+  // TODO(jam): make this take a WebContents once it's created from content.
+  explicit TabContentsViewGtk(content::WebContents* web_contents,
                               TabContentsViewWrapperGtk* wrapper);
   virtual ~TabContentsViewGtk();
 
diff --git a/content/browser/tab_contents/tab_contents_view_win.cc b/content/browser/tab_contents/tab_contents_view_win.cc
index 3bd9d5c..c70ea75 100644
--- a/content/browser/tab_contents/tab_contents_view_win.cc
+++ b/content/browser/tab_contents/tab_contents_view_win.cc
@@ -11,6 +11,8 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
+using content::WebContents;
+
 namespace {
 
 // We need to have a parent window for the compositing code to work correctly.
@@ -46,9 +48,9 @@ class TempParent : public ui::WindowImpl {
 
 }  // namespace namespace
 
-TabContentsViewWin::TabContentsViewWin(TabContents* tab_contents)
+TabContentsViewWin::TabContentsViewWin(WebContents* web_contents)
     : parent_(NULL),
-      tab_contents_(tab_contents),
+      tab_contents_(static_cast<TabContents*>(web_contents)),
       view_(NULL) {
 }
 
diff --git a/content/browser/tab_contents/tab_contents_view_win.h b/content/browser/tab_contents/tab_contents_view_win.h
index 582ce48..ce994b8 100644
--- a/content/browser/tab_contents/tab_contents_view_win.h
+++ b/content/browser/tab_contents/tab_contents_view_win.h
@@ -16,7 +16,8 @@ class RenderWidgetHostViewWin;
 class TabContentsViewWin : public TabContentsView,
                            public ui::WindowImpl {
  public:
-  explicit TabContentsViewWin(TabContents* tab_contents);
+  // TODO(jam): make this take a WebContents once it's created from content.
+  explicit TabContentsViewWin(content::WebContents* web_contents);
   virtual ~TabContentsViewWin();
 
   void SetParent(HWND parent);