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..cc7d5602c7b729a8309c846e92e679996d407cdc 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "content/public/browser/browser_main_parts.h"

[jam, 2011/10/25 06:11:28]

nit: don't need to add this, just forward declare

[stevenjb, 2011/10/25 19:21:18]

Done.

 #include "content/public/common/window_container_type.h"
 #include "content/public/common/content_client.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
@@ -67,7 +68,6 @@ class Clipboard;
 namespace content {
 
 class BrowserContext;
-class BrowserMainParts;
 class ResourceContext;
 class WebUIFactory;
 
@@ -83,11 +83,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;

[jam, 2011/10/25 06:11:28]

I didn't notice last time that you're passing a non-const reference (against
style guide). please make this a pointer to the vector.

nit: parts instead of parts_list

[stevenjb, 2011/10/25 19:21:18]

Done. Also, it's parts_list everywhere except the member variable in
BrowserMainLoop, so I changed that.

[jam, 2011/10/25 19:43:32]

nit: parts_list isn't that accurate since it's not a list container anymore.. i
think parts is just as descriptive since anyone looking at it can see that it's
a container, but up to you.

 
   // Platform-specific creator. Use this to construct new RenderWidgetHostViews
   // rather than using RenderWidgetHostViewWin & friends.