diff options
| author | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:54:00 +0000 |
|---|---|---|
| committer | tbreisacher@chromium.org <tbreisacher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 16:54:00 +0000 |
| commit | 5b15b3e022afa55438334cfa19cd9bd683d2a440 (patch) | |
| tree | ca99f2cde511c27c34c5ac352f3939f916cf0aa3 | |
| parent | 46aa9553045296b68ef4844119457711a12948a0 (diff) | |
| download | chromium_src-5b15b3e022afa55438334cfa19cd9bd683d2a440.zip chromium_src-5b15b3e022afa55438334cfa19cd9bd683d2a440.tar.gz chromium_src-5b15b3e022afa55438334cfa19cd9bd683d2a440.tar.bz2 | |
Merge 147737 - Speculative fix for bug 137157 as described in http://code.google.com/p/chromium/issues/detail?id=137157#c18
BUG=137157
TEST=No second window pops up on first run. See crbug page.
Review URL: https://chromiumcodereview.appspot.com/10815022
TBR=jennyz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10816037
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@148125 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/first_run/first_run_win.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index 1e7eeab..5987c43 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -399,6 +399,10 @@ bool ImportSettingsWin(Profile* profile, int items_to_import, const FilePath& import_bookmarks_path, bool skip_first_run_ui) { + if (!items_to_import && import_bookmarks_path.empty()) { + return true; + } + const CommandLine& cmdline = *CommandLine::ForCurrentProcess(); CommandLine import_cmd(cmdline.GetProgram()); |