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

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: Addressed owner's remarks. 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..00204a377ef9fe7d63fe2297aad04b4bba856309 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.
+ if ((!is_first_run_ ||
+ (browser_creator_ &&
+ browser_creator_->is_set_as_default_dialog_suppressed())) &&
+ !chrome::ShowAutolaunchPrompt(profile)) {
Ben Goodger (Google) 2012/08/01 18:00:20 So, the only reason ShowDefaultBrowserPrompt() is
motek. 2012/08/01 20:44:52 That other UI (a webUI dlg) is spawned from chrome
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