Add a factory function to create WebContentsView implementations.

content/browser/web_contents/web_contents_impl.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/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 51 matching lines @@
 #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/base/ui_base_switches.h"
 #include "ui/gfx/monitor.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(USE_AURA)
-#include "content/browser/web_contents/web_contents_view_aura.h"
-#elif defined(OS_WIN)
-#include "content/browser/web_contents/web_contents_view_win.h"
-#elif defined(TOOLKIT_GTK)
-#include "content/browser/web_contents/web_contents_view_gtk.h"
-#elif defined(OS_MACOSX)
-#include "content/browser/web_contents/web_contents_view_mac.h"
+#if defined(OS_MACOSX)
 #include "ui/surface/io_surface_support_mac.h"
-#elif defined(OS_ANDROID)
-#include "content/browser/web_contents/web_contents_view_android.h"
 #endif
 
 // Cross-Site Navigations
 //
 // If a WebContentsImpl 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,
@@ skipping 197 matching lines @@
       view_type_(content::VIEW_TYPE_INVALID),
       color_chooser_(NULL) {
   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(USE_AURA)
-    view_.reset(new WebContentsViewAura(this, delegate));
-#elif defined(OS_WIN)
-    view_.reset(new WebContentsViewWin(this, delegate));
-#elif defined(TOOLKIT_GTK)
-    view_.reset(new content::WebContentsViewGtk(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
-    (void)delegate;
+    view_.reset(CreateWebContentsView(this, delegate));
   }
   CHECK(view_.get());
 
   // We have the initial size of the view be based on the size of the view of
   // the passed in WebContents.
   view_->CreateView(base_web_contents ?
       base_web_contents->GetView()->GetContainerSize() : gfx::Size());
 
   // Listen for whether our opener gets destroyed.
   if (opener_) {
@@ skipping 2461 matching lines @@
 void WebContentsImpl::CreateViewAndSetSizeForRVH(RenderViewHost* rvh) {
   RenderWidgetHostView* rwh_view = GetView()->CreateViewForWidget(rvh);
   // Can be NULL during tests.
   if (rwh_view)
     rwh_view->SetSize(GetView()->GetContainerSize());
 }
 
 RenderViewHostImpl* WebContentsImpl::GetRenderViewHostImpl() {
   return static_cast<RenderViewHostImpl*>(GetRenderViewHost());
 }