summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chrome_content_browser_client.h
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 18:03:30 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-26 18:03:30 +0000
commitb48c918f8397747d9a157a87a5cfc63eeed74710 (patch)
tree20bf06e2bb203915d5e135498538550d6b891e4f /chrome/browser/chrome_content_browser_client.h
parent45952868429c278087b68d0e0e96f33ec70388fa (diff)
downloadchromium_src-b48c918f8397747d9a157a87a5cfc63eeed74710.zip
chromium_src-b48c918f8397747d9a157a87a5cfc63eeed74710.tar.gz
chromium_src-b48c918f8397747d9a157a87a5cfc63eeed74710.tar.bz2
Make GTK and Aura parts orthogonal to OS parts
This CL moves GTK and Aura "Parts" out of the primary BrowserMainParts tree and into orthogonal parts that can be added independently. This was done in a way that will facilitate adding additional parts if (when) we need them. The motivation for this was to a) eliminate the existing typedef in chrome_browser_main_chromeos.h b) reduce the number of #ifdefs required in the setup / parts code For an outline of the new parts see: https://docs.google.com/drawings/d/1-gIMl-81c4SvcMrT1xaxnDGibDe7VQfMkFT1bMnIvrg/edit?hl=en_US Please consider this a proposal; I am entirely open to feedback. BUG=none TEST=Chrome compiles and passes tests on all platfroms. Review URL: http://codereview.chromium.org/8302016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.h')
-rw-r--r--chrome/browser/chrome_content_browser_client.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index d8fb323..bb8d55a 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -15,8 +15,9 @@ namespace chrome {
class ChromeContentBrowserClient : public content::ContentBrowserClient {
public:
- virtual content::BrowserMainParts* CreateBrowserMainParts(
- const MainFunctionParams& parameters) OVERRIDE;
+ virtual void CreateBrowserMainParts(
+ const MainFunctionParams& parameters,
+ std::vector<content::BrowserMainParts*>* parts_list) OVERRIDE;
virtual RenderWidgetHostView* CreateViewForWidget(
RenderWidgetHost* widget) OVERRIDE;
virtual TabContentsView* CreateTabContentsView(