Make GTK and Aura parts orthogonal to OS parts

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 95f956b68d8b7d23e2f6df2ea32a4d4688b20bb8..e56f587bcd9d8d23ca8021aee2ebf9024e6e32af 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -67,7 +67,6 @@ class Clipboard;
 namespace content {
 
 class BrowserContext;
-class BrowserMainParts;
 class ResourceContext;
 class WebUIFactory;
 
@@ -83,11 +82,12 @@ class ContentBrowserClient {
  public:
   virtual ~ContentBrowserClient() {}
 
-  // Allows the embedder to return a customed BrowserMainParts implementation
-  // for the browser staratup code. Can return NULL, in which case the default
-  // is used.
-  virtual BrowserMainParts* CreateBrowserMainParts(
-      const MainFunctionParams& parameters) = 0;
+  // Allows the embedder to set any number of custom BrowserMainParts
+  // implementations for the browser startup code. See comments in
+  // browser_main_parts.h.
+  virtual void CreateBrowserMainParts(
+      const MainFunctionParams& parameters,
+      std::vector<BrowserMainParts*>* parts_list) = 0;
 
   // Platform-specific creator. Use this to construct new RenderWidgetHostViews
   // rather than using RenderWidgetHostViewWin & friends.