Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 58 matching lines @@
 #include "content/common/desktop_notification_messages.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/cookie_options.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
-#elif defined(USE_AURA)
-#include "chrome/browser/chrome_browser_main_aura.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/chrome_browser_main_win.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #elif defined(OS_LINUX)
-#include "chrome/browser/chrome_browser_main_gtk.h"
+#include "chrome/browser/chrome_browser_main_linux.h"
+#endif
+
+#if defined(USE_AURA)
+#include "chrome/browser/chrome_browser_parts_aura.h"
+#endif
+
+#if defined(TOOLKIT_USES_GTK)
+#include "chrome/browser/chrome_browser_parts_gtk.h"
 #endif
 
 #if defined(OS_LINUX)
 #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(OS_LINUX)
 #include "chrome/browser/tab_contents/tab_contents_view_gtk.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 #endif
 
 #if defined(USE_NSS)
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
 #endif
 
-
 #if defined(USE_AURA) || defined(TOUCH_UI)
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 #include "content/browser/renderer_host/render_widget_host_view_win.h"
 #elif defined(OS_LINUX)
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 #endif
@@ skipping 66 matching lines @@
       return PRIV_ISOLATED;
   }
 
   return PRIV_EXTENSION;
 }
 
 }  // namespace
 
 namespace chrome {
 
-content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
-    const MainFunctionParams& parameters) {
+void ChromeContentBrowserClient::CreateBrowserMainParts(
+    const MainFunctionParams& parameters,
+    BrowserMainPartsList& parts_list) {
+  // Construct the Main browser parts based on the OS type.
+  // Note: OS_CHROMEOS defines OS_LINUX so handle it first.
 #if defined(OS_CHROMEOS)
-  return new ChromeBrowserMainPartsChromeos(parameters);
-#elif defined(USE_AURA)
-  return new ChromeBrowserMainPartsAura(parameters);
+  parts_list.push_back(new ChromeBrowserMainPartsChromeos(parameters));
 #elif defined(OS_WIN)
-  return new ChromeBrowserMainPartsWin(parameters);
+  parts_list.push_back(new ChromeBrowserMainPartsWin(parameters));
 #elif defined(OS_MACOSX)
-  return new ChromeBrowserMainPartsMac(parameters);
+  parts_list.push_back(new ChromeBrowserMainPartsMac(parameters));
 #elif defined(OS_LINUX)
-  return new ChromeBrowserMainPartsGtk(parameters);
+  parts_list.push_back(new ChromeBrowserMainPartsLinux(parameters));
 #else
-  return NULL;
+  NOTREACHED();
+  parts_list.push_back(new ChromeBrowserMainParts(parameters));
+#endif
+
+  // Construct additional browser parts.
+#if defined(USE_AURA)
+  parts_list.push_back(new ChromeBrowserPartsAura());
+#endif
+#if defined(TOOLKIT_USES_GTK)
+  parts_list.push_back(new ChromeBrowserPartsGtk());
 #endif
 }
 
 RenderWidgetHostView* ChromeContentBrowserClient::CreateViewForWidget(
     RenderWidgetHost* widget) {
 #if defined(USE_AURA) || defined(TOUCH_UI)
   return new RenderWidgetHostViewViews(widget);
 #elif defined(OS_WIN)
   if (views::Widget::IsPureViews())
     return new RenderWidgetHostViewViews(widget);
@@ skipping 738 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return browser::NewCryptoModuleBlockingDialogDelegate(
       browser::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome