diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 11:44:32 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 11:44:32 +0000 |
| commit | 43860988aae98d71a41958bc5e63c64a3ee852db (patch) | |
| tree | 5b516cff60e539a9cd70f6694cb33dc40936d341 /chrome/app/chrome_dll_main.cc | |
| parent | dcef27d608622ed0816a3190b7b4c8ba88bed866 (diff) | |
| download | chromium_src-43860988aae98d71a41958bc5e63c64a3ee852db.zip chromium_src-43860988aae98d71a41958bc5e63c64a3ee852db.tar.gz chromium_src-43860988aae98d71a41958bc5e63c64a3ee852db.tar.bz2 | |
Set --user-data-dir override earlier, so breakpad gets the right path.
BUG=38642
TEST=Using an official build, check whether the crash reporter respects the prefs checkbox when using --user-data_dir
Review URL: http://codereview.chromium.org/3356004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index ee05d82..02f554d 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -613,6 +613,12 @@ int ChromeMain(int argc, char** argv) { app::RegisterPathProvider(); chrome::RegisterPathProvider(); + // Notice a user data directory override if any + const FilePath user_data_dir = + parsed_command_line.GetSwitchValuePath(switches::kUserDataDir); + if (!user_data_dir.empty()) + CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); + #if defined(OS_MACOSX) // TODO(mark): Right now, InitCrashReporter() needs to be called after // CommandLine::Init() and chrome::RegisterPathProvider(). Ideally, Breakpad @@ -700,12 +706,6 @@ int ChromeMain(int argc, char** argv) { _Module.Init(NULL, instance); #endif - // Notice a user data directory override if any - const FilePath user_data_dir = - parsed_command_line.GetSwitchValuePath(switches::kUserDataDir); - if (!user_data_dir.empty()) - CHECK(PathService::Override(chrome::DIR_USER_DATA, user_data_dir)); - bool single_process = #if defined (GOOGLE_CHROME_BUILD) // This is an unsupported and not fully tested mode, so don't enable it for |