diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 16:17:12 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 16:17:12 +0000 |
| commit | e9d7b6cf453475ad269785f3775700339c8a03fb (patch) | |
| tree | 14fa3a46e2579183c3be5d46a808cf3d884b36b4 /chrome/browser/browser_main.cc | |
| parent | 5b2e8faf4be9281ed3775a2d9e1462a56880a678 (diff) | |
| download | chromium_src-e9d7b6cf453475ad269785f3775700339c8a03fb.zip chromium_src-e9d7b6cf453475ad269785f3775700339c8a03fb.tar.gz chromium_src-e9d7b6cf453475ad269785f3775700339c8a03fb.tar.bz2 | |
Some code had been removed from FirstRun::IsChromeFirstRun() so that it may return true then false when later invoked.This caused a bug where we would show the info-bar warning that Chromium is not the default browser after the first run.This patch resurrects that code and changes the first run UI, as it was relying on that behavior.BUG=http://crbug.com/15833TEST=Make IE or Firefox your default browser. Open Chromium so it shows the 1st run UI. Unselect the "make chromium my default browser" button, then press start. When Chromium shows up, there should be no info-bar warning you Chromium is not your default browser. Also test that the first run UI still works as expected.
Review URL: http://codereview.chromium.org/155168
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 2044261..a6df834 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -624,11 +624,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // preferences are registered, since some of the code that the importer // touches reads preferences. if (is_first_run && !first_run_ui_bypass) { - OpenFirstRunDialog(profile, &process_singleton); - // If user cancelled the first run dialog box, the first run sentinel file - // didn't get created and we should exit Chrome. - if (FirstRun::IsChromeFirstRun()) + if (!OpenFirstRunDialog(profile, &process_singleton)) { + // The user cancelled the first run dialog box, we should exit Chrome. return ResultCodes::NORMAL_EXIT; + } } #endif // OS_POSIX |