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..1ea09ff25f400b6ce358166fa09f92c589cf9fad 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"
 #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,13 @@ class ContentBrowserClient {
  public:
   virtual ~ContentBrowserClient() {}
 
+  typedef std::vector<BrowserMainParts*> BrowserMainPartsList;

[jam, 2011/10/24 19:36:00]

nit: i think a typedef isn't necessary in the interface, we usually have that
when we put it as member variables and want to create iterators etc (which we
normally don't use for vectors anyways)

[stevenjb, 2011/10/25 02:51:04]

Done.

+
   // Allows the embedder to return a customed BrowserMainParts implementation
   // for the browser staratup code. Can return NULL, in which case the default

[jam, 2011/10/24 19:36:00]

nit: update the comment for the return value

[stevenjb, 2011/10/25 02:51:04]

Done.

   // is used.
-  virtual BrowserMainParts* CreateBrowserMainParts(
-      const MainFunctionParams& parameters) = 0;
+  virtual void CreateBrowserMainParts(const MainFunctionParams& parameters,
+                                      BrowserMainPartsList& parts_list) = 0;
 
   // Platform-specific creator. Use this to construct new RenderWidgetHostViews
   // rather than using RenderWidgetHostViewWin & friends.