summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_main.cc
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 21:36:46 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-17 21:36:46 +0000
commit2d06f559b7475b5cd0a2f5bf974f8f330943ebda (patch)
tree2823a3974e382dfe5d7e9ca489c3d4c0a0ea6b00 /chrome/browser/browser_main.cc
parentd867f56ab5def1f70a72936b856cf367199d38fe (diff)
downloadchromium_src-2d06f559b7475b5cd0a2f5bf974f8f330943ebda.zip
chromium_src-2d06f559b7475b5cd0a2f5bf974f8f330943ebda.tar.gz
chromium_src-2d06f559b7475b5cd0a2f5bf974f8f330943ebda.tar.bz2
Fix die-on-launch.
Review URL: http://codereview.chromium.org/126295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
-rw-r--r--chrome/browser/browser_main.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index a8cf018..4eb094f 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -392,10 +392,13 @@ int BrowserMain(const MainFunctionParams& parameters) {
// method at present.
Profile* profile = NULL;
OpenFirstRunDialog(profile, &process_singleton);
+
+#if defined(GOOGLE_CHROME_BUILD)
// 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
}
#endif // OS_POSIX