Moved mobile activation into its own modal dialog

chrome/browser/ui/browser.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2213 matching lines @@
   ShowOptionsTab(chrome::kLanguageOptionsSubPage);
 }
 
 void Browser::OpenSystemTabAndActivate() {
   OpenURL(GURL(chrome::kChromeUISystemInfoURL), GURL(),
           NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
   window_->Activate();
 }
 
 void Browser::OpenMobilePlanTabAndActivate() {
-  OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(),
-          NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
-  window_->Activate();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableMobileSetupDialog)) {
+    window_->ShowMobileSetup();
+  } else {
+    OpenURL(GURL(chrome::kChromeUIMobileSetupURL), GURL(),
+            NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
+    window_->Activate();
+  }
 }
 #endif
 
 void Browser::OpenPluginsTabAndActivate() {
   OpenURL(GURL(chrome::kChromeUIPluginsURL), GURL(),
           NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK);
   window_->Activate();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 3287 matching lines @@
 }
 
 void Browser::UpdateFullscreenExitBubbleContent() {
   GURL url;
   if (fullscreened_tab_)
     url = fullscreened_tab_->tab_contents()->GetURL();
 
   window_->UpdateFullscreenExitBubbleContent(
       url, GetFullscreenExitBubbleType());
 }