diff options
| author | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 02:24:00 +0000 |
|---|---|---|
| committer | yusukes@chromium.org <yusukes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 02:24:00 +0000 |
| commit | d867ae23002aec14e09065f52565ff50955713fb (patch) | |
| tree | bf8d934d64c52166c4dfb9b8e7e0a9b8e19cc19d | |
| parent | 18b5821d9858a884621f51c965f29084727ccf47 (diff) | |
| download | chromium_src-d867ae23002aec14e09065f52565ff50955713fb.zip chromium_src-d867ae23002aec14e09065f52565ff50955713fb.tar.gz chromium_src-d867ae23002aec14e09065f52565ff50955713fb.tar.bz2 | |
Merge 64003 - Call SetBrowserX11ErrorHandlers before calling profile_manager()->GetDefaultProfile() on ChromeOS since GetDefaultProfile() calls an Xlib function (see Issue 7875).
Please note that the change does not change the behavior of Chrome for Windows/Mac/Linux.
BUG=chromium-os:7875
TEST=manually checked that Chrome for ChromeOS could start normally with the change.
Review URL: http://codereview.chromium.org/4142002
TBR=yusukes@chromium.org
Review URL: http://codereview.chromium.org/4095004
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64005 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index aa139c3..848864c 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1160,6 +1160,10 @@ int BrowserMain(const MainFunctionParams& parameters) { } #endif +#if defined(USE_X11) + SetBrowserX11ErrorHandlers(); +#endif + // Profile creation ---------------------------------------------------------- #if defined(OS_CHROMEOS) @@ -1201,10 +1205,6 @@ int BrowserMain(const MainFunctionParams& parameters) { } #endif -#if defined(USE_X11) - SetBrowserX11ErrorHandlers(); -#endif - // Modifies the current command line based on active experiments on // about:flags. Profile* profile = CreateProfile(parameters, user_data_dir); |