ChromeOS Gaia: When webview is enabled CrOS get oauth_code from accounts.sandbox.google.com and mak…

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 37 matching lines @@
 
 namespace chromeos {
 
 namespace {
 
 const char kJsScreenPath[] = "login.GaiaSigninScreen";
 const char kAuthIframeParentName[] = "signin-frame";
 const char kAuthIframeParentOrigin[] =
     "chrome-extension://mfffpogegjflfpflabcdkioaeobkgjik/";
 
+// TODO(rsorokin): Get rid of this url before the release.

[Dmitry Polukhin, 2015/02/26 12:54:02]

Please file an issue, make it release beta blocker for M43 and link it here.

+const char kStagingGaiaUrl[] = "https://accounts.sandbox.google.com/";
 // TODO(rsorokin): Move this to the proper file.
 const char kMinuteMaidPath[] = "ChromeOsEmbeddedSetup";
 
 void UpdateAuthParams(base::DictionaryValue* params,
                       bool has_users,
                       bool is_enrolling_consumer_management) {
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = true;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   bool allow_guest = true;
@@ skipping 168 matching lines @@
 
     params.SetString("chromeType", GetChromeDeviceTypeString());
     params.SetString("clientId",
                      GaiaUrls::GetInstance()->oauth2_chrome_client_id());
     if (!command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) {
       command_line->AppendSwitchASCII(switches::kGaiaEndpointChromeOS,
                                       kMinuteMaidPath);
     }
   }
 
-  const GURL gaia_url =
-      command_line->HasSwitch(::switches::kGaiaUrl)
-          ? GURL(command_line->GetSwitchValueASCII(::switches::kGaiaUrl))
-          : GaiaUrls::GetInstance()->gaia_url();
-  params.SetString("gaiaUrl", gaia_url.spec());
+  if (StartupUtils::IsWebviewSigninEnabled()) {
+    // We can't use switch --gaia-url in this case cause we need get
+    // auth_code from staging gaia and make all the other auths against prod
+    // gaia so user could use all the google services.
+    const GURL gaia_url = GURL(kStagingGaiaUrl);
+    params.SetString("gaiaUrl", gaia_url.spec());
+  } else {
+    const GURL gaia_url =
+        command_line->HasSwitch(::switches::kGaiaUrl)
+            ? GURL(command_line->GetSwitchValueASCII(::switches::kGaiaUrl))
+            : GaiaUrls::GetInstance()->gaia_url();
+    params.SetString("gaiaUrl", gaia_url.spec());
+  }
 
   if (command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) {
     params.SetString("gaiaEndpoint", command_line->GetSwitchValueASCII(
                                          switches::kGaiaEndpointChromeOS));
   }
   if (context.embedded_signin_enabled) {
     params.SetBoolean("useEmbedded", true);
     // We set 'constrained' here to switch troubleshooting page on embedded
     // signin to full tab.
     params.SetInteger("constrained", 1);
@@ skipping 526 matching lines @@
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 }  // namespace chromeos