Make GTK and Aura parts orthogonal to OS parts

content/public/browser/content_browser_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #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"
 
 class AccessTokenStore;
 class BrowserRenderProcessHost;
 class BrowserURLHandler;
 class CommandLine;
 class DevToolsManager;
 class FilePath;
@@ skipping 38 matching lines @@
 class SpeechInputManager;
 }
 
 namespace ui {
 class Clipboard;
 }
 
 namespace content {
 
 class BrowserContext;
-class BrowserMainParts;
 class ResourceContext;
 class WebUIFactory;
 
 // Embedder API (or SPI) for participating in browser logic, to be implemented
 // by the client of the content browser. See ChromeContentBrowserClient for the
 // principal implementation. The methods are assumed to be called on the UI
 // thread unless otherwise specified. Use this "escape hatch" sparingly, to
 // avoid the embedder interface ballooning and becoming very specific to Chrome.
 // (Often, the call out to the client can happen in a different part of the code
 // that either already has a hook out to the embedder, or calls out to one of
 // the observer interfaces.)
 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.
   //
   // This function must NOT size it, because the RenderView in the renderer
   // wouldn't have been created yet. The widget would set its "waiting for
   // resize ack" flag, and the ack would never come becasue no RenderView
   // received it.
   //
   // The RenderWidgetHost must already be created (because we can't know if it's
@@ skipping 241 matching lines @@
   // This is called on a worker thread.
   virtual
       crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
           const GURL& url) = 0;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_