| Index: chrome/browser/browser_main.cc
|
| ===================================================================
|
| --- chrome/browser/browser_main.cc (revision 80315)
|
| +++ chrome/browser/browser_main.cc (working copy)
|
| @@ -1415,6 +1415,12 @@
|
| SetBrowserX11ErrorHandlers();
|
| #endif
|
|
|
| + // Override the default ContentBrowserClient to let Chrome participate in
|
| + // content logic. Must be done before any tabs are created or the profile is
|
| + // created.
|
| + chrome::ChromeContentBrowserClient browser_client;
|
| + content::GetContentClient()->set_browser(&browser_client);
|
| +
|
| // Profile creation ----------------------------------------------------------
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -1461,11 +1467,6 @@
|
| PrefService* user_prefs = profile->GetPrefs();
|
| DCHECK(user_prefs);
|
|
|
| - // Override the default ContentBrowserClient to let Chrome participate in
|
| - // content logic. Must be done before any tabs are created.
|
| - chrome::ChromeContentBrowserClient browser_client;
|
| - content::GetContentClient()->set_browser(&browser_client);
|
| -
|
| // Tests should be able to tune login manager before showing it.
|
| // Thus only show login manager in normal (non-testing) mode.
|
| if (!parameters.ui_task) {
|
|
|