Turn on inline signin by default

chrome/browser/ui/webui/inline_login_ui.cc

 // Copyright 2013 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/inline_login_ui.h"
 
 #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"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/browser/signin/signin_oauth_helper.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #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/profile_management_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_switches.h"
@@ skipping 89 matching lines @@
 
   void LoadAuthExtension() {
     base::DictionaryValue params;
 
     const std::string& app_locale = g_browser_process->GetApplicationLocale();
     params.SetString("hl", app_locale);
 
     GaiaUrls* gaiaUrls = GaiaUrls::GetInstance();
     params.SetString("gaiaUrl", gaiaUrls->gaia_url().spec());
 
-    bool enable_inline = switches::IsEnableInlineSignin();
-    params.SetInteger("authMode",
-        enable_inline ? kInlineAuthMode : kDefaultAuthMode);
 
-    // Set parameters specific for inline signin flow.
-#if !defined(OS_CHROMEOS)
-    if (enable_inline) {
+#if defined(OS_CHROMEOS)
+    params.SetInteger("authMode", kDefaultAuthMode);
+#else
+    params.SetInteger("authMode", kInlineAuthMode);
 
-      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());
+    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 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 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);
+    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_);
+    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);
   }
 
   // JS callback:
   void HandleInitialize(const base::ListValue* args) {
     LoadAuthExtension();
   }
 
@@ skipping 219 matching lines @@
   content::WebUIDataSource::Add(profile, CreateWebUIDataSource());
 
   web_ui->AddMessageHandler(new InlineLoginUIHandler(profile));
   // Required for intercepting extension function calls when the page is loaded
   // in a bubble (not a full tab, thus tab helpers are not registered
   // automatically).
   extensions::TabHelper::CreateForWebContents(web_ui->GetWebContents());
 }
 
 InlineLoginUI::~InlineLoginUI() {}