Aura/ash split: Split the extra parts into ash and aura parts.

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 100 matching lines @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/chrome_browser_main_extra_parts_views.h"
 #endif
 
 #if defined(USE_AURA)
 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
 #endif
 
+#if defined(USE_ASH)
+#include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
+#endif
+
 #if defined(OS_LINUX) || defined(OS_OPENBSD)
 #include "base/linux_util.h"
 #include "chrome/browser/crash_handler_host_linux.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/tab_contents/chrome_web_contents_view_gtk_delegate.h"
 #include "content/browser/tab_contents/tab_contents_view_gtk.h"
@@ skipping 209 matching lines @@
 #endif
 
 #if defined(TOOLKIT_VIEWS)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
 #endif
 
 #if defined(USE_AURA)
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAura());
 #endif
 
+#if defined(USE_ASH)
+  main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
+#endif
+
   return main_parts;
 }
 
 content::WebContentsView* ChromeContentBrowserClient::CreateWebContentsView(
     WebContents* web_contents) {
 #if defined(OS_WIN) && !defined(USE_AURA)
   return new TabContentsViewWin(
       web_contents, new ChromeWebContentsViewWinDelegate(web_contents));
 #elif defined(TOOLKIT_VIEWS)
   return new TabContentsViewViews(web_contents);
@@ skipping 1249 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome