diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:13:31 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 19:13:31 +0000 |
| commit | 50462bf085b6504b0fe0d947664348870b0f26c7 (patch) | |
| tree | 94474e4a310b97410ef4a449edd7d31d8d629abc /content/shell/shell_content_browser_client.h | |
| parent | 3a08f3fcd05e5f4b703b043ee1a7ff48cc4c86f4 (diff) | |
| download | chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.zip chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.tar.gz chromium_src-50462bf085b6504b0fe0d947664348870b0f26c7.tar.bz2 | |
Add ChromeBrowserMainExtraParts for non main parts. (take 3)
This was originally submitted as http://codereview.chromium.org/8539038/ which was reverted because of a failing test on win.
This reverts the code back to a single instance of BrowserMainParts, with auxillary parts (Gtk, Views, Aura, Touch) implemented from a new base class, ChromeBrowserParts, which has a Chrome specific interface, allowing initialization to be better subdivided.
This should fix the notifications auto tests.
This CL also addresses the test failure on win (and a test failure on linux_chromeos triggered by the windows fix).
BUG=103821
TEST=Make sure all tests and autotests run
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/8480032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_content_browser_client.h')
| -rw-r--r-- | content/shell/shell_content_browser_client.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index 1231ae0..4d0ac37 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -33,9 +33,8 @@ class ShellContentBrowserClient : public ContentBrowserClient shell_browser_main_parts_ = parts; } - virtual void CreateBrowserMainParts( - const content::MainFunctionParams& parameters, - std::vector<BrowserMainParts*>* parts_list) OVERRIDE; + virtual BrowserMainParts* CreateBrowserMainParts( + const content::MainFunctionParams& parameters) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( RenderWidgetHost* widget) OVERRIDE; virtual TabContentsView* CreateTabContentsView( |