Revert 130442 - Adds a TabContentsViewAura.

chrome/browser/chrome_content_browser_client.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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 95 matching lines @@
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_aura.h"
-#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h"
 #elif defined(OS_WIN)
-#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_views.h"
+#include "chrome/browser/tab_contents/chrome_web_contents_view_delegate_win.h"
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chrome_browser_main_extra_parts_gtk.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/chrome_browser_main_extra_parts_views.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #endif
@@ skipping 229 matching lines @@
 #if defined(USE_AURA)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
 #endif
 
   return main_parts;
 }
 
 content::WebContentsView*
     ChromeContentBrowserClient::OverrideCreateWebContentsView(
         WebContents* web_contents) {
-#if defined(USE_AURA)
-  // TODO(beng): remove this once TCVV is gone.
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (!command_line.HasSwitch(switches::kEnableTCVA)) {
-    return new TabContentsViewViews(web_contents,
-                                    GetWebContentsViewDelegate(web_contents));
-  }
+#if defined(TOOLKIT_VIEWS) && (!defined(OS_WIN) || defined(USE_AURA))
+  return new TabContentsViewViews(web_contents,
+                                  GetWebContentsViewDelegate(web_contents));
 #endif
   return NULL;
 }
 
 content::WebContentsViewDelegate*
     ChromeContentBrowserClient::GetWebContentsViewDelegate(
         content::WebContents* web_contents) {
-#if defined(OS_WIN) || defined(USE_AURA)
-// TODO(beng): replace all of this once TCVV is removed.
-#if defined(OS_WIN)
-  return new ChromeWebContentsViewDelegateViews(web_contents);
-#elif defined(USE_AURA)
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableTCVA))
-    return new ChromeWebContentsViewDelegateViews(web_contents);
-  return new ChromeWebContentsViewDelegateAura(web_contents);
-#endif
+#if defined(OS_WIN) && !defined(USE_AURA)
+  return new ChromeWebContentsViewDelegateWin(web_contents);
 #elif defined(TOOLKIT_GTK)
   return new ChromeWebContentsViewDelegateGtk(web_contents);
 #elif defined(OS_MACOSX)
   return
       chrome_web_contents_view_delegate_mac::CreateWebContentsViewDelegateMac(
           web_contents);
+#elif defined(USE_AURA)
+  return new ChromeWebContentsViewDelegateAura(web_contents);
 #else
   return NULL;
 #endif
 }
 
 void ChromeContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
 
   SiteInstance* site_instance = render_view_host->GetSiteInstance();
   Profile* profile = Profile::FromBrowserContext(
@@ skipping 1239 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome