Adds browser preferences to configure first-run flow on Windows 8.

- master_prefefrencs/installerdata file may now contain
  { "distribution": {
      "suppress_first_run_default_browser_prompt": true
    } } 
  to suppress the Win8+ first-run dialog that walks the
  user through making Chrome the default browser. 
  If the dialog is suppressed, the default browser
  butterbar/prompt appears on first run instead.

- master_preferences/installerdata file may now contain
  { "browser": {
    "suppress_switch_to_metro_mode_on_set_default": true
  } }
  to suppress switching to metro mode on Win8+ immediately
  after Chrome is made the default browser via the first-run
  dialog.

This CL also removes the non-dialog mode of 
SetAsDefaultBrowserUI and fixes a problem where the dialog 
would be shown only when master preferences were not given.


BUG=135255,135256,135257
TEST=Verify that modifiers described above act as 
advertised in setup procedure on Win8. If both prefs are 
absent, the program should show a modal set-default dialog
and upon successful change restart Chrome *into the
normal first-run flow* in Metro. Note that butter-bar set
default is not expected to restart into metro.

Review URL: https://chromiumcodereview.appspot.com/10702097

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149881 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chrome_browser_main.cc

@@ -76,6 +76,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_ui_prefs.h"
+#include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/uma_browsing_activity_observer.h"
 #include "chrome/browser/ui/user_data_dir_dialog.h"
@@ -1122,6 +1123,11 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
 
     chrome::SetNewHomePagePrefs(profile_->GetPrefs());
     browser_process_->profile_manager()->OnImportFinished(profile_);
+
+    if (!master_prefs_->suppress_first_run_default_browser_prompt)
+      chrome::ShowFirstRunDefaultBrowserPrompt(profile_);
+    else
+      browser_creator_->set_is_default_browser_dialog_suppressed(true);
   }  // if (is_first_run_)
 
 #if defined(OS_WIN)

chrome/browser/first_run/first_run.cc

@@ -235,6 +235,12 @@ void SetupMasterPrefsFromInstallPrefs(
           &value) && value) {
     out_prefs->make_chrome_default = true;
   }
+
+  if (install_prefs->GetBool(
+          installer::master_preferences::kSuppressFirstRunDefaultBrowserPrompt,
+          &value) && value) {
+    out_prefs->suppress_first_run_default_browser_prompt = true;
+  }
 }
 
 void SetDefaultBrowser(installer::MasterPreferences* install_prefs){
@@ -409,7 +415,8 @@ MasterPrefs::MasterPrefs()
       homepage_defined(false),
       do_import_items(0),
       dont_import_items(0),
-      make_chrome_default(false) {
+      make_chrome_default(false),
+      suppress_first_run_default_browser_prompt(false) {
 }
 
 MasterPrefs::~MasterPrefs() {}

chrome/browser/first_run/first_run.h

@@ -48,6 +48,7 @@ struct MasterPrefs {
   int do_import_items;
   int dont_import_items;
   bool make_chrome_default;
+  bool suppress_first_run_default_browser_prompt;
   std::vector<GURL> new_tabs;
   std::vector<GURL> bookmarks;
 };

chrome/browser/first_run/first_run_win.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/ui/startup/default_browser_prompt.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
@@ -554,7 +553,6 @@ void AutoImport(
   process_singleton->Unlock();
   CreateSentinel();
 #endif  // !defined(USE_AURA)
-  chrome::ShowFirstRunDefaultBrowserPrompt(profile);
 }
 
 int ImportNow(Profile* profile, const CommandLine& cmdline) {

chrome/browser/ui/browser_ui_prefs.cc

@@ -82,9 +82,13 @@ void RegisterBrowserUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kCheckDefaultBrowser,
                              true,
                              PrefService::UNSYNCABLE_PREF);
-  prefs->RegisterBooleanPref(prefs::kDefaultBrowserFlowDialog,
-                             true,
+#if defined(OS_WIN)
+  // As with Mac-spacific code above, it should be in a platform-specific
+  // section somewhere, but there is no good place for it.
+  prefs->RegisterBooleanPref(prefs::kSuppressSwitchToMetroModeOnSetDefault,
+                             false,
                              PrefService::UNSYNCABLE_PREF);
+#endif
   prefs->RegisterBooleanPref(prefs::kShowOmniboxSearchHint,
                              true,
                              PrefService::UNSYNCABLE_PREF);

chrome/browser/ui/startup/default_browser_prompt.cc

@@ -181,12 +181,10 @@ namespace chrome {
 void ShowDefaultBrowserPrompt(Profile* profile) {
   // We do not check if we are the default browser if:
   // - the user said "don't ask me again" on the infobar earlier.
-  // - this is the first launch after the first run flow.
   // - There is a policy in control of this setting.
-  if (!profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser) ||
-      first_run::IsChromeFirstRun()) {
+  if (!profile->GetPrefs()->GetBoolean(prefs::kCheckDefaultBrowser))
     return;
-  }
+
   if (g_browser_process->local_state()->IsManagedPreference(
       prefs::kDefaultBrowserSettingEnabled)) {
     if (g_browser_process->local_state()->GetBoolean(

chrome/browser/ui/startup/default_browser_prompt_win.cc

@@ -61,10 +61,7 @@ void SetMetroBrowserFlowLauncher::Observe(
 
   // Unregister and delete.
   registrar_.RemoveAll();
-  bool as_dialog =
-      profile_->GetPrefs()->GetBoolean(prefs::kDefaultBrowserFlowDialog);
-
-  SetAsDefaultBrowserUI::Show(profile_, browser, as_dialog);
+  SetAsDefaultBrowserUI::Show(profile_, browser);
   delete this;
 }
 

chrome/browser/ui/startup/startup_browser_creator.cc

@@ -154,7 +154,9 @@ base::LazyInstance<ProfileLaunchObserver> profile_launch_observer =
 
 }  // namespace
 
-StartupBrowserCreator::StartupBrowserCreator() {}
+StartupBrowserCreator::StartupBrowserCreator()
+    : is_default_browser_dialog_suppressed_(false) {
+}
 
 StartupBrowserCreator::~StartupBrowserCreator() {}
 

chrome/browser/ui/startup/startup_browser_creator.h

@@ -83,6 +83,14 @@ class StartupBrowserCreator {
       const CommandLine& command_line,
       Profile* profile);
 
+  void set_is_default_browser_dialog_suppressed(bool new_value) {
+    is_default_browser_dialog_suppressed_ = new_value;
+  }
+
+  bool is_default_browser_dialog_suppressed() const {
+    return is_default_browser_dialog_suppressed_;
+  }
+
  private:
   friend class CloudPrintProxyPolicyTest;
   friend class CloudPrintProxyPolicyStartupTest;
@@ -118,6 +126,11 @@ class StartupBrowserCreator {
   // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
+  // True if the set-as-default dialog has been explicitly supressed.
+  // This information is used to allow the default browser prompt to show on
+  // first-run when the dialog has been suppressed.
+  bool is_default_browser_dialog_suppressed_;
+
   // True if we have already read and reset the preference kWasRestarted. (A
   // member variable instead of a static variable inside WasRestarted because
   // of testing.)

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_default_browser_dialog_suppressed())) &&
+            !chrome::ShowAutolaunchPrompt(profile)) {
           chrome::ShowDefaultBrowserPrompt(profile);
+        }
       }
 #if defined(OS_MACOSX)
       // Check whether the auto-update system needs to be promoted from user

chrome/browser/ui/webui/set_as_default_browser_ui.cc

@@ -135,10 +135,15 @@ void SetAsDefaultBrowserHandler::SetDefaultWebClientUIState(
     // chrome the default. We fold this UI and move on.
     ConcludeInteraction();
   } else if (state == ShellIntegration::STATE_IS_DEFAULT) {
-    BrowserThread::PostTask(
-        BrowserThread::FILE, FROM_HERE,
-        base::Bind(&SetAsDefaultBrowserHandler::ActivateMetroChrome,
-                   base::Unretained(this)));
+    if (!Profile::FromWebUI(web_ui())->GetPrefs()->GetBoolean(
+            prefs::kSuppressSwitchToMetroModeOnSetDefault)) {
+      BrowserThread::PostTask(
+          BrowserThread::FILE, FROM_HERE,
+          base::Bind(&SetAsDefaultBrowserHandler::ActivateMetroChrome,
+                     base::Unretained(this)));
+    } else {
+      ConcludeInteraction();
+    }
   }
 }
 
@@ -167,20 +172,13 @@ void SetAsDefaultBrowserHandler::ConcludeInteraction() {
   WebContents* contents = web_ui()->GetWebContents();
   if (contents) {
     content::WebContentsDelegate* delegate = contents->GetDelegate();
-    if (delegate) {
-      if (!delegate->IsPopupOrPanel(contents)) {
-        Browser* browser = browser::FindBrowserWithWebContents(contents);
-        if (browser)
-          chrome::ShowSyncSetup(browser, SyncPromoUI::SOURCE_START_PAGE);
-      }
+    if (delegate)
       delegate->CloseContents(contents);
-    }
   }
 }
 
 void SetAsDefaultBrowserHandler::ActivateMetroChrome() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
   FilePath cur_chrome_exe;
   bool sentinel_removed = false;
   if (PathService::Get(base::FILE_EXE, &cur_chrome_exe) &&
@@ -313,19 +311,9 @@ SetAsDefaultBrowserUI::SetAsDefaultBrowserUI(content::WebUI* web_ui)
 }
 
 // static
-void SetAsDefaultBrowserUI::Show(Profile* profile,
-                                 Browser* browser,
-                                 bool dialog) {
+void SetAsDefaultBrowserUI::Show(Profile* profile, Browser* browser) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (dialog) {
-    SetAsDefaultBrowserDialogImpl* dialog =
-        new SetAsDefaultBrowserDialogImpl(profile, browser);
-    dialog->ShowDialog();
-  } else {
-    GURL url(chrome::kChromeUIMetroFlowURL);
-    chrome::NavigateParams params(
-        chrome::GetSingletonTabNavigateParams(browser, url));
-    params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
-    chrome::ShowSingletonTabOverwritingNTP(browser, params);
-  }
+  SetAsDefaultBrowserDialogImpl* dialog =
+      new SetAsDefaultBrowserDialogImpl(profile, browser);
+  dialog->ShowDialog();
 }

chrome/browser/ui/webui/set_as_default_browser_ui.h

@@ -18,7 +18,7 @@ class SetAsDefaultBrowserUI : public content::WebUIController {
   explicit SetAsDefaultBrowserUI(content::WebUI* web_ui);
 
   // Present metroizer UI either in a new singleton tab or in a dialog window.
-  static void Show(Profile* profile, Browser* browser, bool dialog);
+  static void Show(Profile* profile, Browser* browser);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SetAsDefaultBrowserUI);

chrome/common/pref_names.cc

@@ -855,9 +855,13 @@ const char kPluginsAlwaysAuthorize[] = "plugins.always_authorize";
 // on start-up.
 const char kCheckDefaultBrowser[] = "browser.check_default_browser";
 
-// TODO(motek): Remove this once a firm decision is made regarding how the UI
-// should be presented.
-const char kDefaultBrowserFlowDialog[] = "browser.set_default_flow_dialog";
+#if defined(OS_WIN)
+// By default, setting Chrome as default during first run on Windows 8 will
+// trigger shutting down the current instance and spawning a new (Metro)
+// Chrome. This boolean preference supresses this behaviour.
+const char kSuppressSwitchToMetroModeOnSetDefault[] =
+    "browser.suppress_switch_to_metro_mode_on_set_default";
+#endif
 
 // Policy setting whether default browser check should be disabled and default
 // browser registration should take place.

chrome/common/pref_names.h

@@ -310,7 +310,9 @@ extern const char kPluginsShowDetails[];
 extern const char kPluginsAllowOutdated[];
 extern const char kPluginsAlwaysAuthorize[];
 extern const char kCheckDefaultBrowser[];
-extern const char kDefaultBrowserFlowDialog[];
+#if defined(OS_WIN)
+extern const char kSuppressSwitchToMetroModeOnSetDefault[];
+#endif
 extern const char kDefaultBrowserSettingEnabled[];
 #if defined(OS_MACOSX)
 extern const char kShowUpdatePromotionInfoBar[];

chrome/installer/util/master_preferences_constants.cc

@@ -31,6 +31,8 @@ namespace master_preferences {
   const char kLogFile[] = "log_file";
   const char kMakeChromeDefault[] = "make_chrome_default";
   const char kMakeChromeDefaultForUser[] = "make_chrome_default_for_user";
+  const char kSuppressFirstRunDefaultBrowserPrompt[] =
+      "suppress_first_run_default_browser_prompt";
   const char kMsi[] = "msi";
   const char kMultiInstall[] = "multi_install";
   const char kRequireEula[] = "require_eula";

chrome/installer/util/master_preferences_constants.h

@@ -70,6 +70,11 @@ extern const char kMsi[];
 extern const char kMultiInstall[];
 // Boolean. Show EULA dialog before install.
 extern const char kRequireEula[];
+// Boolean. Indicates that the first-run 'set-as-default' dialog should not be
+// shown. Relevant in Windows 8+ context only. If this is true, the standard
+// 'set default browser' prompt on the butter-bar will appear during the first
+// run.
+extern const char kSuppressFirstRunDefaultBrowserPrompt[];
 // Boolean. Install Chrome to system wise location. Cmd line override present.
 extern const char kSystemLevel[];
 // Boolean. Run installer in verbose mode. Cmd line override present.