Make GTK and Aura parts orthogonal to OS parts

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8072046919e92f88f1a6c50218b23fb2116da200..062b4eb09057f3062a04d9a1622719bb0b741615 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -68,6 +68,7 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/common/desktop_notification_messages.h"
+#include "content/public/browser/browser_main_parts.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/cookie_monster.h"
@@ -77,14 +78,20 @@
 
 #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(TOOLKIT_USES_GTK)
-#include "chrome/browser/chrome_browser_main_gtk.h"
+#elif defined(OS_LINUX)
+#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)
@@ -104,7 +111,6 @@
 #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)
@@ -191,20 +197,30 @@ RenderProcessHostPrivilege GetProcessPrivilege(
 
 namespace chrome {
 
-content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(
-    const MainFunctionParams& parameters) {
+void ChromeContentBrowserClient::CreateBrowserMainParts(
+    const MainFunctionParams& parameters,
+    std::vector<content::BrowserMainParts*>& 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);
-#elif defined(TOOLKIT_USES_GTK)
-  return new ChromeBrowserMainPartsGtk(parameters);
+  parts_list.push_back(new ChromeBrowserMainPartsMac(parameters));
+#elif defined(OS_LINUX)
+  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
 }