Add ChromeBrowserMainExtraParts for non main parts (take 2)

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 <vector>
@@ skipping 67 matching lines @@
 // (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() {}
 
   // 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 content::MainFunctionParams& parameters,
-      std::vector<BrowserMainParts*>* parts_list) = 0;
+  virtual BrowserMainParts* CreateBrowserMainParts(
+      const content::MainFunctionParams& parameters) = 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 261 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_