Enable "Let me choose what to sync" checkbox in gaia sign in page.

chrome/browser/ui/webui/sync_promo/sync_promo_ui.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_promo/sync_promo_ui.h"
 
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 32 matching lines @@
 namespace {
 
 const char kStringsJsFile[] = "strings.js";
 const char kSyncPromoJsFile[] = "sync_promo.js";
 
 const char kSyncPromoQueryKeyAutoClose[] = "auto_close";
 const char kSyncPromoQueryKeyContinue[] = "continue";
 const char kSyncPromoQueryKeyNextPage[] = "next_page";
 const char kSyncPromoQueryKeySource[] = "source";
 
-// TODO(rogerta): It would be better to use about:blank, but until that is
-// supported by Gaia this blank continue URL will be used.
-const char kContinueUrl[] = "http://www.google.com/gen_204";
+// Gaia cannot support about:blank as a continue URL, so using a hosted blank
+// page instead.
+const char kContinueUrl[] =
+    "https://www.google.com/intl/%s/chrome/blank.html?%s=%d";
 
 // The maximum number of times we want to show the sync promo at startup.
 const int kSyncPromoShowAtStartupMaximum = 10;
 
 // Checks we want to show the sync promo for the given brand.
 bool AllowPromoAtStartupForCurrentBrand() {
   std::string brand;
   google_util::GetBrand(&brand);
 
   if (brand.empty())
@@ skipping 167 matching lines @@
     //  - tell Gaia which service the user is signing into.  In this case,
     //    a chrome sign in uses the service "chromiumsync"
     //  - provide a continue URL.  This is the URL that Gaia will redirect to
     //    once the sign is complete.
     //
     // The continue URL includes a source parameter that can be extracted using
     // the function GetSourceForSyncPromoURL() below.  This is used to know
     // which of the chrome sign in access points was used to sign the userr in.
     // See OneClickSigninHelper for details.
     url_string = GaiaUrls::GetInstance()->service_login_url();
-    url_string.append("?service=chromiumsync");
+    url_string.append("?service=chromiumsync&sarp=1&rm=hide");
 
-    std::string continue_url = base::StringPrintf("%s?%s=%d",
-        kContinueUrl, kSyncPromoQueryKeySource, static_cast<int>(source));
+    const std::string& locale = g_browser_process->GetApplicationLocale();
+    std::string continue_url = base::StringPrintf(kContinueUrl, locale.c_str(),
+        kSyncPromoQueryKeySource, static_cast<int>(source));
 
     base::StringAppendF(&url_string, "&%s=%s", kSyncPromoQueryKeyContinue,
                         net::EscapeQueryParamValue(
                             continue_url, false).c_str());
   } else {
     url_string = base::StringPrintf("%s?%s=%d", chrome::kChromeUISyncPromoURL,
                                     kSyncPromoQueryKeySource,
                                     static_cast<int>(source));
 
     if (auto_close)
       base::StringAppendF(&url_string, "&%s=1", kSyncPromoQueryKeyAutoClose);
 
     if (!next_page.spec().empty()) {
       base::StringAppendF(&url_string, "&%s=%s", kSyncPromoQueryKeyNextPage,
                           net::EscapeQueryParamValue(next_page.spec(),
                                                      false).c_str());
     }
   }
 
   return GURL(url_string);
 }
 
 // static
 GURL SyncPromoUI::GetNextPageURLForSyncPromoURL(const GURL& url) {
+  const char* key_name = UseWebBasedSigninFlow() ? kSyncPromoQueryKeyContinue :
+      kSyncPromoQueryKeyNextPage;
   std::string value;
-  if (chrome_common_net::GetValueForKeyInQuery(
-          url, kSyncPromoQueryKeyNextPage, &value)) {
+  if (chrome_common_net::GetValueForKeyInQuery(url, key_name, &value)) {
     return GURL(value);
   }
   return GURL();
 }
 
 // static
 SyncPromoUI::Source SyncPromoUI::GetSourceForSyncPromoURL(const GURL& url) {
   std::string value;
   if (chrome_common_net::GetValueForKeyInQuery(
           url, kSyncPromoQueryKeySource, &value)) {
@@ skipping 20 matching lines @@
 
 // static
 bool SyncPromoUI::UseWebBasedSigninFlow() {
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kUseWebBasedSigninFlow);
 #else
   return false;
 #endif
 }