Enable web-based sign in flow by default. Can use command line argument

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2012 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/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 169 matching lines @@
 
 bool AreUserNamesEqual(const string16& user1, const string16& user2) {
   return NormalizeUserName(user1) == NormalizeUserName(user2);
 }
 
 bool IsKeystoreEncryptionEnabled() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSyncKeystoreEncryption);
 }
 
-bool UseWebBasedSigninFlow() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kUseWebBasedSigninFlow);
-}
-
 void BringTabToFront(WebContents* web_contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (browser) {
     TabStripModel* tab_strip_model = browser->tab_strip_model();
     if (tab_strip_model) {
       int index = tab_strip_model->GetIndexOfWebContents(web_contents);
       if (index != TabStripModel::kNoTab)
         tab_strip_model->ActivateTabAt(index, false);
     }
   }
@@ skipping 290 matching lines @@
           GetStringUTF16(IDS_SYNC_FULL_ENCRYPTION_DATA));
     }
   } else {
     args.SetBoolean("usePassphrase", service->IsUsingSecondaryPassphrase());
   }
 
   StringValue page("configure");
   web_ui()->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page, args);
 
-  if (UseWebBasedSigninFlow()) {
+  if (SyncPromoUI::UseWebBasedSigninFlow()) {
     // Make sure the tab used for the Gaia sign in does not cover the settings
     // tab.
     FocusUI();
   }
 }
 
 void SyncSetupHandler::ConfigureSyncDone() {
   StringValue page("done");
   web_ui()->CallJavascriptFunction(
       "SyncSetupOverlay.showSyncSetupPage", page);
@@ skipping 60 matching lines @@
   web_ui()->RegisterMessageCallback("SyncSetupStopSyncing",
       base::Bind(&SyncSetupHandler::HandleStopSyncing,
                  base::Unretained(this)));
 }
 
 SigninManager* SyncSetupHandler::GetSignin() const {
   return SigninManagerFactory::GetForProfile(GetProfile());
 }
 
 void SyncSetupHandler::DisplayGaiaLogin(bool fatal_error) {
-  if (UseWebBasedSigninFlow()) {
-    DCHECK(!active_gaia_signin_tab_);
-
+  if (SyncPromoUI::UseWebBasedSigninFlow()) {
     // Advanced options are no longer being configured if the login screen is
     // visible. If the user exits the signin wizard after this without
     // configuring sync, CloseSyncSetup() will ensure they are logged out.
     configuring_sync_ = false;
 
-    GURL url(SyncPromoUI::GetSyncPromoURL(GURL(),
-        SyncPromoUI::SOURCE_SETTINGS, false));
-    Browser* browser = chrome::FindBrowserWithWebContents(
-        web_ui()->GetWebContents());
-    active_gaia_signin_tab_ = browser->OpenURL(
-        content::OpenURLParams(url, content::Referrer(), SINGLETON_TAB,
-                                content::PAGE_TRANSITION_AUTO_BOOKMARK,
-                                false));
-    content::WebContentsObserver::Observe(active_gaia_signin_tab_);
+    DisplayGaiaLoginInNewTab();
     signin_tracker_.reset(
         new SigninTracker(GetProfile(), this,
                           SigninTracker::WAITING_FOR_GAIA_VALIDATION));
   } else {
     retry_on_signin_failure_ = true;
     DisplayGaiaLoginWithErrorMessage(string16(), fatal_error);
   }
 }
 
+void SyncSetupHandler::DisplayGaiaLoginInNewTab() {
+  DCHECK(!active_gaia_signin_tab_);
+  GURL url(SyncPromoUI::GetSyncPromoURL(GURL(),
+      SyncPromoUI::SOURCE_SETTINGS, false));
+  Browser* browser = chrome::FindBrowserWithWebContents(
+      web_ui()->GetWebContents());
+  active_gaia_signin_tab_ = browser->OpenURL(
+      content::OpenURLParams(url, content::Referrer(), SINGLETON_TAB,
+                              content::PAGE_TRANSITION_AUTO_BOOKMARK,
+                              false));
+  content::WebContentsObserver::Observe(active_gaia_signin_tab_);
+}
+
 void SyncSetupHandler::DisplayGaiaLoginWithErrorMessage(
     const string16& error_message, bool fatal_error) {
   // Advanced options are no longer being configured if the login screen is
   // visible. If the user exits the signin wizard after this without
   // configuring sync, CloseSyncSetup() will ensure they are logged out.
   configuring_sync_ = false;
 
   string16 local_error_message(error_message);
 
   // Setup args for the GAIA login screen:
@@ skipping 112 matching lines @@
   // By default, do nothing - subclasses can override.
 }
 
 void SyncSetupHandler::DisplayGaiaSuccessAndClose() {
   RecordSignin();
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndClose");
 }
 
 void SyncSetupHandler::DisplayGaiaSuccessAndSettingUp() {
   RecordSignin();
-  if (UseWebBasedSigninFlow())
+  if (SyncPromoUI::UseWebBasedSigninFlow())
     CloseGaiaSigninPage();
 
   web_ui()->CallJavascriptFunction("SyncSetupOverlay.showSuccessAndSettingUp");
 }
 
 void SyncSetupHandler::OnDidClosePage(const ListValue* args) {
   CloseSyncSetup();
 }
 
 void SyncSetupHandler::HandleSubmitAuth(const ListValue* args) {
@@ skipping 80 matching lines @@
 }
 
 void SyncSetupHandler::SigninFailed(const GoogleServiceAuthError& error) {
   // Stop a timer to handle timeout in waiting for checking network connection.
   backend_start_timer_.reset();
 
   last_signin_error_ = error;
 
   // If using web-based sign in flow, don't show the gaia sign in page again
   // since there is no way to show the user an error message.
-  if (UseWebBasedSigninFlow()) {
+  if (SyncPromoUI::UseWebBasedSigninFlow()) {
     CloseSyncSetup();
   } else if (retry_on_signin_failure_) {
     // Got a failed signin - this is either just a typical auth error, or a
     // sync error (treat sync errors as "fatal errors" - i.e. non-auth errors).
     // On ChromeOS, this condition can happen when auth token is invalid and
     // cannot start sync backend.
     // If using web-based sign in flow, don't show the gaia sign in page again
     // since there is no way to show the user an error message.
     DisplayGaiaLogin(GetSyncService()->HasUnrecoverableError());
   } else {
@@ skipping 252 matching lines @@
     // User is not logged in, or login has been specially requested - need to
     // display login UI (cases 1-4).
     DisplayGaiaLogin(false);
   } else {
     // User is already logged in. They must have brought up the config wizard
     // via the "Advanced..." button or through One-Click signin (cases 5/6), or
     // they are re-enabling sync on Chrome OS.
     DisplayConfigureSync(true, false);
   }
 
-  if (!UseWebBasedSigninFlow())
+  if (!SyncPromoUI::UseWebBasedSigninFlow())
     ShowSetupUI();
 }
 
 void SyncSetupHandler::OpenConfigureSync() {
   if (!PrepareSyncSetup())
     return;
 
   DisplayConfigureSync(true, false);
   ShowSetupUI();
 }
 
 void SyncSetupHandler::FocusUI() {
   DCHECK(IsActiveLogin());
-  if (UseWebBasedSigninFlow() && signin_tracker_) {
+  if (SyncPromoUI::UseWebBasedSigninFlow() && signin_tracker_) {
       BringTabToFront(active_gaia_signin_tab_);

[Andrew T Wilson (Slow), 2012/12/08 08:38:24]

Wrong indent.

[Roger Tawa OOO till Jul 10th, 2012/12/08 14:42:16]

Done.

   } else {
     WebContents* web_contents = web_ui()->GetWebContents();
     web_contents->GetDelegate()->ActivateContents(web_contents);
   }
 }
 
 void SyncSetupHandler::CloseUI() {
   DCHECK(IsActiveLogin());
   CloseOverlay();
 }
@@ skipping 76 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }