OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" | 5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 if (!enterprise_domain.empty()) | 238 if (!enterprise_domain.empty()) |
239 params.SetString("enterpriseDomain", enterprise_domain); | 239 params.SetString("enterpriseDomain", enterprise_domain); |
240 | 240 |
241 params.SetString("chromeType", GetChromeDeviceTypeString()); | 241 params.SetString("chromeType", GetChromeDeviceTypeString()); |
242 params.SetString("clientId", | 242 params.SetString("clientId", |
243 GaiaUrls::GetInstance()->oauth2_chrome_client_id()); | 243 GaiaUrls::GetInstance()->oauth2_chrome_client_id()); |
244 if (!command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) { | 244 if (!command_line->HasSwitch(switches::kGaiaEndpointChromeOS)) { |
245 command_line->AppendSwitchASCII(switches::kGaiaEndpointChromeOS, | 245 command_line->AppendSwitchASCII(switches::kGaiaEndpointChromeOS, |
246 kMinuteMaidPath); | 246 kMinuteMaidPath); |
247 } | 247 } |
| 248 } else { |
| 249 params.SetBoolean("useMinuteMaid", false); |
248 } | 250 } |
249 | 251 |
250 if (!command_line->HasSwitch(::switches::kGaiaUrl) && | 252 if (!command_line->HasSwitch(::switches::kGaiaUrl) && |
251 StartupUtils::IsWebviewSigninEnabled()) { | 253 StartupUtils::IsWebviewSigninEnabled()) { |
252 // We can't use switch --gaia-url in this case cause we need get | 254 // We can't use switch --gaia-url in this case cause we need get |
253 // auth_code from staging gaia and make all the other auths against prod | 255 // auth_code from staging gaia and make all the other auths against prod |
254 // gaia so user could use all the google services. | 256 // gaia so user could use all the google services. |
255 // TODO(dpolukhin): crbug.com/462204 | 257 // TODO(dpolukhin): crbug.com/462204 |
256 const GURL gaia_url = GURL(kStagingGaiaUrl); | 258 const GURL gaia_url = GURL(kStagingGaiaUrl); |
257 params.SetString("gaiaUrl", gaia_url.spec()); | 259 params.SetString("gaiaUrl", gaia_url.spec()); |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
837 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 839 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
838 DCHECK(signin_screen_handler_); | 840 DCHECK(signin_screen_handler_); |
839 return signin_screen_handler_->delegate_; | 841 return signin_screen_handler_->delegate_; |
840 } | 842 } |
841 | 843 |
842 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { | 844 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { |
843 signin_screen_handler_ = handler; | 845 signin_screen_handler_ = handler; |
844 } | 846 } |
845 | 847 |
846 } // namespace chromeos | 848 } // namespace chromeos |
OLD | NEW |