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

chrome/browser/ui/webui/set_as_default_browser_ui.cc

Index: chrome/browser/ui/webui/set_as_default_browser_ui.cc
diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc
index 57f514306cdd95fd3a3f0c1f606c460943a15097..e1a13ebc05e51aec4e03bedbd840f34e549004ff 100644
--- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc
+++ b/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);

[Peter Kasting, 2012/07/27 18:48:06]

Is deleting this correct?  I didn't see anything in your description about
removing the sync promo but I'm not very familiar with any of this code.

[motek., 2012/07/28 17:46:44]

This is OK. This does not remove sync promo, but a piece of code which would be
executed only when this page is shown in-tab. This mode (non-popup) is being
removed here so this became dead code. Trust me, I put it here in the first
place. 

-      }
+    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();
 }