diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 16:51:10 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-17 16:51:10 +0000 |
| commit | 8c14a436fe6488c8f647ff79301102e885838c77 (patch) | |
| tree | 892832adcf466be0b9515ab2b84553a94afb5814 /chrome/browser/browser_main.cc | |
| parent | effb25df8e23ffc027fefe0b271a47e16f7a6240 (diff) | |
| download | chromium_src-8c14a436fe6488c8f647ff79301102e885838c77.zip chromium_src-8c14a436fe6488c8f647ff79301102e885838c77.tar.gz chromium_src-8c14a436fe6488c8f647ff79301102e885838c77.tar.bz2 | |
Exit Chrome and show FRUI again on the next run, if user clicks on Cancel.
BUG=10825
Review URL: http://codereview.chromium.org/118528
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index af71c74..a8cf018 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -392,6 +392,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // method at present. Profile* profile = NULL; 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()) + return ResultCodes::NORMAL_EXIT; } #endif // OS_POSIX @@ -610,6 +614,10 @@ int BrowserMain(const MainFunctionParams& parameters) { // 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()) + return ResultCodes::NORMAL_EXIT; } #endif // OS_POSIX |