diff options
| author | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 02:06:07 +0000 |
|---|---|---|
| committer | piman@google.com <piman@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 02:06:07 +0000 |
| commit | 1eb9cbc8fadbfd0af19d12108d5623a40f88b4e4 (patch) | |
| tree | f116951cf58237f97ebe8d5d54fc215bd255b97d | |
| parent | b38db788ee896f842abac933ae6641568a16afb2 (diff) | |
| download | chromium_src-1eb9cbc8fadbfd0af19d12108d5623a40f88b4e4.zip chromium_src-1eb9cbc8fadbfd0af19d12108d5623a40f88b4e4.tar.gz chromium_src-1eb9cbc8fadbfd0af19d12108d5623a40f88b4e4.tar.bz2 | |
Fix browser initialization crash
BUG=78377
TEST=Run the browser, observe no crash
Review URL: http://codereview.chromium.org/6691050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80404 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 74253dd..75944c5 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1413,6 +1413,11 @@ int BrowserMain(const MainFunctionParams& parameters) { SetBrowserX11ErrorHandlers(); #endif + // Override the default ContentBrowserClient to let Chrome participate in + // content logic. Must be done before any tabs or profiles are created. + chrome::ChromeContentBrowserClient browser_client; + content::GetContentClient()->set_browser(&browser_client); + // Profile creation ---------------------------------------------------------- #if defined(OS_CHROMEOS) @@ -1459,11 +1464,6 @@ int BrowserMain(const MainFunctionParams& parameters) { 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) { |