diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 21:34:03 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-18 21:34:03 +0000 |
| commit | c219b794541d520c15eb0579bdc6b55dabe31633 (patch) | |
| tree | 267d564520407f3fdad15e9b0f3ce5873fe026f9 /content/shell/shell_content_browser_client.h | |
| parent | ccb65c7419d0d3211148c982b0fc92b2c60eefb8 (diff) | |
| download | chromium_src-c219b794541d520c15eb0579bdc6b55dabe31633.zip chromium_src-c219b794541d520c15eb0579bdc6b55dabe31633.tar.gz chromium_src-c219b794541d520c15eb0579bdc6b55dabe31633.tar.bz2 | |
Revert 110710 - Add ChromeBrowserMainExtraParts for non main parts.
Revert 110741 - Fix ProcessSingletonTest.StartupRaceCondition for win.
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=stevenjb@chromium.org
Review URL: http://codereview.chromium.org/8596015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110753 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, 3 insertions, 2 deletions
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h index 4d0ac37..1231ae0 100644 --- a/content/shell/shell_content_browser_client.h +++ b/content/shell/shell_content_browser_client.h @@ -33,8 +33,9 @@ class ShellContentBrowserClient : public ContentBrowserClient shell_browser_main_parts_ = parts; } - virtual BrowserMainParts* CreateBrowserMainParts( - const content::MainFunctionParams& parameters) OVERRIDE; + virtual void CreateBrowserMainParts( + const content::MainFunctionParams& parameters, + std::vector<BrowserMainParts*>* parts_list) OVERRIDE; virtual RenderWidgetHostView* CreateViewForWidget( RenderWidgetHost* widget) OVERRIDE; virtual TabContentsView* CreateTabContentsView( |