diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:41:06 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-21 20:41:06 +0000 |
| commit | a788ae164b688345ec361c75a9677ca54228f7b4 (patch) | |
| tree | 846ba70a67cc38c409f4591bf80677154007e182 | |
| parent | abd0b9a1898e9f0aa5581596c968a46be00d3e7a (diff) | |
| download | chromium_src-a788ae164b688345ec361c75a9677ca54228f7b4.zip chromium_src-a788ae164b688345ec361c75a9677ca54228f7b4.tar.gz chromium_src-a788ae164b688345ec361c75a9677ca54228f7b4.tar.bz2 | |
Fix silent import from file during install.
Regression was caused by changes made for
http://code.google.com/p/chromium/issues/detail?id=40975.
The change broke first run import
http://code.google.com/p/chromium/issues/detail?id=41077.
A fix is made but there is a bug in the fix.
BUG=46763
TEST=mini_installer.exe --installerdata="path"
Review URL: http://codereview.chromium.org/2820014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50379 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/browser_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 37c4947..29016d6 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1112,8 +1112,8 @@ int BrowserMain(const MainFunctionParams& parameters) { // from other browsers. In case this process is a short-lived "import" // process that another browser runs just to import the settings, we // don't want to be checking for another browser process, by design. - if (!parsed_command_line.HasSwitch(switches::kImport) || - parsed_command_line.HasSwitch(switches::kImportFromFile)) { + if (!(parsed_command_line.HasSwitch(switches::kImport) || + parsed_command_line.HasSwitch(switches::kImportFromFile))) { #endif // When another process is running, use that process instead of starting a // new one. NotifyOtherProcess will currently give the other process up to |