Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1407)

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 10702097: Adds browser preferences to configure first-run flow on Windows 8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverted the most recent name change. Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index ca0e97f30fbaaa825636fa2f1402f35c8b84857b..cafa94ce2e8899c21786070a7b605bb22b6031ce 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -362,8 +362,15 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,
if (process_startup) {
if (browser_defaults::kOSSupportsOtherBrowsers &&
!command_line_.HasSwitch(switches::kNoDefaultBrowserCheck)) {
- if (!chrome::ShowAutolaunchPrompt(profile))
+ // Generally, the default browser prompt should not be shown on first
+ // run. However, when the set-as-default dialog has been suppressed, we
+ // need to allow it.
+ bool permit_prompt_on_first_run = browser_creator_ &&
gab 2012/07/26 17:06:18 nit: s/bool/const bool This make it clearer to th
Peter Kasting 2012/07/27 18:48:06 I'd probably just inline the whole thing into the
motek. 2012/07/28 17:46:44 Done.
motek. 2012/07/28 17:46:44 Inlined explicitly as suggested by pkasting@.
+ browser_creator_->is_set_as_default_dialog_suppressed();
+ if ((!is_first_run_ || permit_prompt_on_first_run) &&
+ !chrome::ShowAutolaunchPrompt(profile)) {
Peter Kasting 2012/07/27 18:48:06 Nit: {} unnecessary
motek. 2012/07/28 17:46:44 But the convention in this file seems to be that i
Peter Kasting 2012/07/28 17:50:41 I think you're probably right.
chrome::ShowDefaultBrowserPrompt(profile);
+ }
}
#if defined(OS_MACOSX)
// Check whether the auto-update system needs to be promoted from user

Powered by Google App Engine
This is Rietveld 408576698