Move creation of content TabContentsViews to content so that we can hide these headers through DEPS…

content/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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.h"
 
 #include <cmath>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 47 matching lines @@
 #include "content/public/common/url_constants.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/base/network_change_notifier.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_WIN) && !defined(USE_AURA)
+#include "content/browser/tab_contents/tab_contents_view_win.h"
+#elif defined(TOOLKIT_GTK)
+#include "content/browser/tab_contents/tab_contents_view_gtk.h"
+#elif defined(OS_MACOSX)
+#include "content/browser/tab_contents/web_contents_view_mac.h"
 #include "ui/gfx/surface/io_surface_support_mac.h"
-#endif  // defined(OS_MACOSX)
+#elif defined(OS_ANDROID)
+#include "content/browser/tab_contents/web_contents_view_android.h"
+#endif
 
 // Cross-Site Navigations
 //
 // If a TabContents is told to navigate to a different web site (as determined
 // by SiteInstance), it will replace its current RenderViewHost with a new
 // RenderViewHost dedicated to the new SiteInstance.  This works as follows:
 //
 // - Navigate determines whether the destination is cross-site, and if so,
 //   it creates a pending_render_view_host_.
 // - The pending RVH is "suspended," so that no navigation messages are sent to
@@ skipping 151 matching lines @@
 // TabContents ----------------------------------------------------------------
 
 TabContents::TabContents(content::BrowserContext* browser_context,
                          SiteInstance* site_instance,
                          int routing_id,
                          const TabContents* base_tab_contents,
                          SessionStorageNamespaceImpl* session_storage_namespace)
     : delegate_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(controller_(
           this, browser_context, session_storage_namespace)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(view_(
-          content::GetContentClient()->browser()->CreateWebContentsView(this))),
       ALLOW_THIS_IN_INITIALIZER_LIST(render_manager_(this, this)),
       is_loading_(false),
       crashed_status_(base::TERMINATION_STATUS_STILL_RUNNING),
       crashed_error_code_(0),
       waiting_for_response_(false),
       load_state_(net::LOAD_STATE_IDLE, string16()),
       upload_size_(0),
       upload_position_(0),
       displayed_insecure_content_(false),
       capturing_contents_(false),
       is_being_destroyed_(false),
       notify_disconnection_(false),
       dialog_creator_(NULL),
 #if defined(OS_WIN)
       message_box_active_(CreateEvent(NULL, TRUE, FALSE, NULL)),
 #endif
       is_showing_before_unload_dialog_(false),
       opener_web_ui_type_(WebUI::kNoWebUI),
       closed_by_user_gesture_(false),
       minimum_zoom_percent_(
           static_cast<int>(content::kMinimumZoomFactor * 100)),
       maximum_zoom_percent_(
           static_cast<int>(content::kMaximumZoomFactor * 100)),
       temporary_zoom_settings_(false),
       content_restrictions_(0),
       view_type_(content::VIEW_TYPE_TAB_CONTENTS),
       has_opener_(false) {
   render_manager_.Init(browser_context, site_instance, routing_id);
 
+  view_.reset(content::GetContentClient()->browser()->
+      OverrideCreateWebContentsView(this));
+  if (!view_.get()) {
+    content::WebContentsViewDelegate* delegate =
+        content::GetContentClient()->browser()->GetWebContentsViewDelegate(
+            this);
+#if defined(OS_WIN) && !defined(USE_AURA)
+    view_.reset(new TabContentsViewWin(this, delegate));
+#elif defined(TOOLKIT_GTK)
+    view_.reset(new content::TabContentsViewGtk(this, delegate));
+#elif defined(OS_MACOSX)
+    view_.reset(web_contents_view_mac::CreateWebContentsView(this, delegate));
+#elif defined(OS_ANDROID)
+    view_.reset(new WebContentsViewAndroid(this));
+#endif
+  }
+  CHECK(view_.get());
+
   // We have the initial size of the view be based on the size of the passed in
   // tab contents (normally a tab from the same window).
   view_->CreateView(base_tab_contents ?
       base_tab_contents->GetView()->GetContainerSize() : gfx::Size());
 
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_host_manager_.reset(
       new JavaBridgeDispatcherHostManager(this));
 #endif
 }
@@ skipping 2220 matching lines @@
 void TabContents::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }
 
 RenderViewHostImpl* TabContents::GetRenderViewHostImpl() {
   return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
 }