Turn on inline signin by default

chrome/browser/ui/webui/inline_login_ui.cc

Index: chrome/browser/ui/webui/inline_login_ui.cc
diff --git a/chrome/browser/ui/webui/inline_login_ui.cc b/chrome/browser/ui/webui/inline_login_ui.cc
index 4ee7cb7824a7cc07bf1d56f368f5379886c47924..da4522bd3e075ee567fa5e61725494bf6b44e1b0 100644
--- a/chrome/browser/ui/webui/inline_login_ui.cc
+++ b/chrome/browser/ui/webui/inline_login_ui.cc
@@ -6,7 +6,6 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
-#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -27,7 +26,6 @@
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/browser/ui/sync/one_click_signin_sync_starter.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
@@ -137,51 +135,46 @@ class InlineLoginUIHandler : public GaiaAuthConsumer,
     GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
     params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
 
-    bool enable_inline = CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kEnableInlineSignin);
-    params.SetInteger("authMode",
-        enable_inline ? kInlineAuthMode : kDefaultAuthMode);
+#if defined(OS_CHROMEOS)
+    params.SetInteger("authMode", kDefaultAuthMode);
+#else
+    params.SetInteger("authMode", kInlineAuthMode);
 
-    // Set parameters specific for inline signin flow.
-#if !defined(OS_CHROMEOS)
-    if (enable_inline) {
-
-      const GURL& current_url = web_ui()->GetWebContents()->GetURL();
-      signin::Source source = signin::GetSourceForPromoURL(current_url);
-      DCHECK(source != signin::SOURCE_UNKNOWN);
-      if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
-          source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
-        // Drop the leading slash in the path.
-        params.SetString("gaiaPath",
-            gaiaUrls->embedded_signin_url().path().substr(1));
-      }
+    const GURL& current_url = web_ui()->GetWebContents()->GetURL();
+    signin::Source source = signin::GetSourceForPromoURL(current_url);
+    DCHECK(source != signin::SOURCE_UNKNOWN);
+    if (source == signin::SOURCE_AVATAR_BUBBLE_ADD_ACCOUNT ||
+        source == signin::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
+      // Drop the leading slash in the path.
+      params.SetString("gaiaPath",
+          gaiaUrls->embedded_signin_url().path().substr(1));
+    }
 
-      params.SetString("service", "chromiumsync");
-      params.SetString("continueUrl",
-          signin::GetLandingURL("source", static_cast<int>(source)).spec());
-
-      std::string email;
-      net::GetValueForKeyInQuery(current_url, "Email", &email);
-      if (!email.empty())
-        params.SetString("email", email);
-
-      std::string frame_url;
-      net::GetValueForKeyInQuery(current_url, "frameUrl", &frame_url);
-      if (!frame_url.empty())
-        params.SetString("frameUrl", frame_url);
-
-      std::string is_constrained;
-      net::GetValueForKeyInQuery(current_url, "constrained", &is_constrained);
-      if (!is_constrained.empty())
-        params.SetString("constrained", is_constrained);
-
-      net::GetValueForKeyInQuery(current_url, "partitionId", &partition_id_);
-      if (partition_id_.empty()) {
-        partition_id_ =
-            "gaia-webview-" + base::IntToString(next_partition_id.GetNext());
-      }
-      params.SetString("partitionId", partition_id_);
+    params.SetString("service", "chromiumsync");
+    params.SetString("continueUrl",
+        signin::GetLandingURL("source", static_cast<int>(source)).spec());
+
+    std::string email;
+    net::GetValueForKeyInQuery(current_url, "Email", &email);
+    if (!email.empty())
+      params.SetString("email", email);
+
+    std::string frame_url;
+    net::GetValueForKeyInQuery(current_url, "frameUrl", &frame_url);
+    if (!frame_url.empty())
+      params.SetString("frameUrl", frame_url);
+
+    std::string is_constrained;
+    net::GetValueForKeyInQuery(current_url, "constrained", &is_constrained);
+    if (!is_constrained.empty())
+      params.SetString("constrained", is_constrained);

[Roger Tawa OOO till Jul 10th, 2013/12/17 20:59:18]

What is this change for?  Why replace email with this?

[guohui, 2013/12/17 23:00:25]

as discussed offline, i did not replace email, only indentation changes here =)

+
+    net::GetValueForKeyInQuery(current_url, "partitionId", &partition_id_);
+    if (partition_id_.empty()) {
+      partition_id_ =
+          "gaia-webview-" + base::IntToString(next_partition_id.GetNext());
     }
+    params.SetString("partitionId", partition_id_);
 #endif // OS_CHROMEOS
 
     web_ui()->CallJavascriptFunction("inline.login.loadAuthExtension", params);