summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 19:22:35 +0000
committerkuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 19:22:35 +0000
commit609a1ec621cdcce03328b56e4b744ce9498b2177 (patch)
tree686c216b0d0b8ce2c2d8151ea27eb8f998fc580e /chrome
parentd8f8a5949f1e5cd15058ade51296ca620d456736 (diff)
downloadchromium_src-609a1ec621cdcce03328b56e4b744ce9498b2177.zip
chromium_src-609a1ec621cdcce03328b56e4b744ce9498b2177.tar.gz
chromium_src-609a1ec621cdcce03328b56e4b744ce9498b2177.tar.bz2
Start Chrome button on First Run customize view should launch Chrome.
BUG=16358 Review URL: http://codereview.chromium.org/149398 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_main.cc1
-rw-r--r--chrome/browser/views/first_run_view.cc1
2 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index d7eeb53..4907ebb 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -596,7 +596,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
if (is_first_run && !first_run_ui_bypass) {
if (!OpenFirstRunDialog(profile, &process_singleton)) {
// The user cancelled the first run dialog box, we should exit Chrome.
-
return ResultCodes::NORMAL_EXIT;
}
}
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 00904e9..a80f7b9 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -198,6 +198,7 @@ bool FirstRunView::Cancel() {
// Notification from the customize dialog that the user accepted. Since all
// the work is done there we got nothing else to do.
void FirstRunView::CustomizeAccepted() {
+ accepted_ = true;
window()->Close();
}