Sync UI: Add a flag to enable the new signin flow.

BUG=111244
TEST=none
R=csilv

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

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

chrome/app/generated_resources.grd

@@ -11482,6 +11482,14 @@ Some features may be unavailable.  Please check that the profile exists and you
         Sync service is not available for your domain.
       </message>
 
+      <!-- Sync Signin Flag -->
+      <message name="IDS_ENABLE_SYNC_SIGNIN_NAME" desc="Title of the enable sync signin flag." >
+        Enable sync signin
+      </message>
+      <message name="IDS_ENABLE_SYNC_SIGNIN_DESCRIPTION" desc="Description of the enable sync signin flag.">
+        Enables a new sync signin flow where all signin UI is forwarded to chrome:signin.
+      </message>
+
       <!-- Web Store login dialog strings -->
       <message name="IDS_WEB_STORE_LOGIN_INTRODUCTION_1" desc="The first message to display in the Web Store login dialog.">
         To use the Chrome Web Store, you must sign in with a Google Account.

chrome/browser/about_flags.cc

@@ -643,6 +643,13 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kNoDiscardTabs)
   },
 #endif
+  {
+    "enable-sync-signing",
+    IDS_ENABLE_SYNC_SIGNIN_NAME,
+    IDS_ENABLE_SYNC_SIGNIN_DESCRIPTION,
+    kOsAll,
+    SINGLE_VALUE_TYPE(switches::kEnableSyncSignin)
+  },
 };
 
 const Experiment* experiments = kExperiments;

chrome/browser/resources/sync_setup_overlay.js

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+<include src="../shared/js/util.js"></include>
+
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
 

chrome/common/chrome_switches.cc

@@ -598,6 +598,9 @@ const char kEnableSpdy3[]                   = "enable-spdy3";
 // Enables experimental suggestions pane in New Tab page.
 const char kEnableSuggestionsTabPage[]      = "enable-suggestions-ntp";
 
+// Enables the new Sync Signin flow, i.e., chrome:signin for all signins.
+const char kEnableSyncSignin[]              = "enable-sync-signin";
+
 // Enables syncing browser sessions.
 const char kEnableSyncTabs[]                = "enable-sync-tabs";
 
@@ -631,12 +634,12 @@ const char kEnableWebStoreLink[]            = "enable-webstore-link";
 
 // Enables experimental features for Spellchecker. Right now, the first
 // experimental feature is auto spell correct, which corrects words which are
-// misppelled by typing the word with two consecutive letters swapped. The
+// misspelled by typing the word with two consecutive letters swapped. The
 // features that will be added next are:
 //
 // 1 - Allow multiple spellcheckers to work simultaneously.
 // 2 - Allow automatic detection of spell check language.
-// TODO(sidchat): Implement the above fetaures to work under this flag.
+// TODO(sidchat): Implement the above features to work under this flag.
 const char kExperimentalSpellcheckerFeatures[] =
     "experimental-spellchecker-features";
 

chrome/common/chrome_switches.h

@@ -169,6 +169,7 @@ extern const char kEnableSdch[];
 extern const char kEnableSpdy3[];
 extern const char kEnableSpdyFlowControl[];
 extern const char kEnableSuggestionsTabPage[];
+extern const char kEnableSyncSignin[];
 extern const char kEnableSyncTabs[];
 extern const char kDisableSyncTabs[];
 extern const char kEnableSyncTabsForOtherClients[];