Move WebContentsView methods that are only called inside content over to WebContentsViewPort.

Review URL: https://codereview.chromium.org/12313084

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

4 files changed, 45 insertions, 41 deletions

diff --git a/content/test/test_content_browser_client.cc b/content/test/test_content_browser_client.cc
index 05dcd12..5754fd2 100644
--- a/content/test/test_content_browser_client.cc
+++ b/content/test/test_content_browser_client.cc
@@ -19,7 +19,7 @@ TestContentBrowserClient::TestContentBrowserClient() {
 TestContentBrowserClient::~TestContentBrowserClient() {
 }
 
-WebContentsView* TestContentBrowserClient::OverrideCreateWebContentsView(
+WebContentsViewPort* TestContentBrowserClient::OverrideCreateWebContentsView(
     WebContents* web_contents,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
 #if defined(OS_IOS)
diff --git a/content/test/test_content_browser_client.h b/content/test/test_content_browser_client.h
index b8b9276..f0d58bb 100644
--- a/content/test/test_content_browser_client.h
+++ b/content/test/test_content_browser_client.h
@@ -20,7 +20,7 @@ class TestContentBrowserClient : public ContentBrowserClient {
   TestContentBrowserClient();
   virtual ~TestContentBrowserClient();
 
-  virtual WebContentsView* OverrideCreateWebContentsView(
+  virtual WebContentsViewPort* OverrideCreateWebContentsView(
       WebContents* web_contents,
       RenderViewHostDelegateView** render_view_host_delegate_view) OVERRIDE;
   virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
diff --git a/content/test/test_web_contents_view.cc b/content/test/test_web_contents_view.cc
index e00bd6e..3658f74 100644
--- a/content/test/test_web_contents_view.cc
+++ b/content/test/test_web_contents_view.cc
@@ -42,20 +42,6 @@ void TestWebContentsView::GotFocus() {
 void TestWebContentsView::TakeFocus(bool reverse) {
 }
 
-void TestWebContentsView::CreateView(const gfx::Size& initial_size,
-                                     gfx::NativeView context) {
-}
-
-RenderWidgetHostView* TestWebContentsView::CreateViewForWidget(
-    RenderWidgetHost* render_widget_host) {
-  return NULL;
-}
-
-RenderWidgetHostView* TestWebContentsView::CreateViewForPopupWidget(
-    RenderWidgetHost* render_widget_host) {
-  return NULL;
-}
-
 gfx::NativeView TestWebContentsView::GetNativeView() const {
   return gfx::NativeView();
 }
@@ -71,9 +57,6 @@ gfx::NativeWindow TestWebContentsView::GetTopLevelNativeWindow() const {
 void TestWebContentsView::GetContainerBounds(gfx::Rect *out) const {
 }
 
-void TestWebContentsView::SetPageTitle(const string16& title) {
-}
-
 void TestWebContentsView::OnTabCrashed(base::TerminationStatus status,
                                        int error_code) {
 }
@@ -81,12 +64,6 @@ void TestWebContentsView::OnTabCrashed(base::TerminationStatus status,
 void TestWebContentsView::SizeContents(const gfx::Size& size) {
 }
 
-void TestWebContentsView::RenderViewCreated(RenderViewHost* host) {
-}
-
-void TestWebContentsView::RenderViewSwappedIn(RenderViewHost* host) {
-}
-
 void TestWebContentsView::Focus() {
 }
 
@@ -103,19 +80,44 @@ WebDropData* TestWebContentsView::GetDropData() const {
   return NULL;
 }
 
-bool TestWebContentsView::IsEventTracking() const {
-  return false;
+gfx::Rect TestWebContentsView::GetViewBounds() const {
+  return gfx::Rect();
 }
 
-void TestWebContentsView::CloseTabAfterEventTracking() {
+#if defined(OS_MACOSX)
+void TestWebContentsView::SetAllowOverlappingViews(bool overlapping) {
 }
+#endif
 
-gfx::Rect TestWebContentsView::GetViewBounds() const {
-  return gfx::Rect();
+void TestWebContentsView::CreateView(const gfx::Size& initial_size,
+                                     gfx::NativeView context) {
+}
+
+RenderWidgetHostView* TestWebContentsView::CreateViewForWidget(
+    RenderWidgetHost* render_widget_host) {
+  return NULL;
+}
+
+RenderWidgetHostView* TestWebContentsView::CreateViewForPopupWidget(
+    RenderWidgetHost* render_widget_host) {
+  return NULL;
+}
+
+void TestWebContentsView::SetPageTitle(const string16& title) {
+}
+
+void TestWebContentsView::RenderViewCreated(RenderViewHost* host) {
+}
+
+void TestWebContentsView::RenderViewSwappedIn(RenderViewHost* host) {
 }
 
 #if defined(OS_MACOSX)
-void TestWebContentsView::SetAllowOverlappingViews(bool overlapping) {
+bool TestWebContentsView::IsEventTracking() const {
+  return false;
+}
+
+void TestWebContentsView::CloseTabAfterEventTracking() {
 }
 #endif
 
diff --git a/content/test/test_web_contents_view.h b/content/test/test_web_contents_view.h
index 97ab618..dfb791a 100644
--- a/content/test/test_web_contents_view.h
+++ b/content/test/test_web_contents_view.h
@@ -37,35 +37,37 @@ class TestWebContentsView : public WebContentsViewPort,
   virtual void TakeFocus(bool reverse) OVERRIDE;
 
   // WebContentsView:
-  virtual void CreateView(const gfx::Size& initial_size,
-                          gfx::NativeView context) OVERRIDE;
-  virtual RenderWidgetHostView* CreateViewForWidget(
-      RenderWidgetHost* render_widget_host) OVERRIDE;
-  virtual RenderWidgetHostView* CreateViewForPopupWidget(
-      RenderWidgetHost* render_widget_host) OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeView GetContentNativeView() const OVERRIDE;
   virtual gfx::NativeWindow GetTopLevelNativeWindow() const OVERRIDE;
   virtual void GetContainerBounds(gfx::Rect *out) const OVERRIDE;
-  virtual void SetPageTitle(const string16& title) OVERRIDE;
   virtual void OnTabCrashed(base::TerminationStatus status,
                             int error_code) OVERRIDE;
   virtual void SizeContents(const gfx::Size& size) OVERRIDE;
-  virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
   virtual void Focus() OVERRIDE;
   virtual void SetInitialFocus() OVERRIDE;
   virtual void StoreFocus() OVERRIDE;
   virtual void RestoreFocus() OVERRIDE;
   virtual WebDropData* GetDropData() const OVERRIDE;
-  virtual bool IsEventTracking() const OVERRIDE;
-  virtual void CloseTabAfterEventTracking() OVERRIDE;
   virtual gfx::Rect GetViewBounds() const OVERRIDE;
 #if defined(OS_MACOSX)
   virtual void SetAllowOverlappingViews(bool overlapping) OVERRIDE;
 #endif
 
   // WebContentsViewPort:
+  virtual void CreateView(const gfx::Size& initial_size,
+                          gfx::NativeView context) OVERRIDE;
+  virtual RenderWidgetHostView* CreateViewForWidget(
+      RenderWidgetHost* render_widget_host) OVERRIDE;
+  virtual RenderWidgetHostView* CreateViewForPopupWidget(
+      RenderWidgetHost* render_widget_host) OVERRIDE;
+  virtual void SetPageTitle(const string16& title) OVERRIDE;
+  virtual void RenderViewCreated(RenderViewHost* host) OVERRIDE;
   virtual void RenderViewSwappedIn(RenderViewHost* host) OVERRIDE;
+#if defined(OS_MACOSX)
+  virtual bool IsEventTracking() const OVERRIDE;
+  virtual void CloseTabAfterEventTracking() OVERRIDE;
+#endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWebContentsView);