Revert 130442 - Adds a TabContentsViewAura.

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 <utility>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 46 matching lines @@
 #include "content/public/common/content_switches.h"
 #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 "webkit/glue/web_intent_data.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(USE_AURA)
-#include "content/browser/tab_contents/tab_contents_view_aura.h"
-#elif defined(OS_WIN)
+#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"
 #elif defined(OS_ANDROID)
 #include "content/browser/tab_contents/web_contents_view_android.h"
 #endif
 
@@ skipping 196 matching lines @@
       has_opener_(false),
       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 TabContentsViewAura(this, delegate));
-#elif defined(OS_WIN)
+#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
     (void)delegate;
   }
@@ skipping 2297 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());
 }