Chromium Code Reviews| 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 "ash/system/devicetype_utils.h" | 7 #include "ash/system/devicetype_utils.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/guid.h" | 10 #include "base/guid.h" |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 341 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); | 341 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); |
| 342 if (command_line->HasSwitch(switches::kEafeUrl)) | 342 if (command_line->HasSwitch(switches::kEafeUrl)) |
| 343 eafe_url = command_line->GetSwitchValueASCII(switches::kEafeUrl); | 343 eafe_url = command_line->GetSwitchValueASCII(switches::kEafeUrl); |
| 344 std::string eafe_path = "planters/cbaudioChrome"; | 344 std::string eafe_path = "planters/cbaudioChrome"; |
| 345 if (command_line->HasSwitch(switches::kEafePath)) | 345 if (command_line->HasSwitch(switches::kEafePath)) |
| 346 eafe_path = command_line->GetSwitchValueASCII(switches::kEafePath); | 346 eafe_path = command_line->GetSwitchValueASCII(switches::kEafePath); |
| 347 | 347 |
| 348 params.SetString("gaiaUrl", eafe_url); | 348 params.SetString("gaiaUrl", eafe_url); |
| 349 params.SetString("gaiaPath", eafe_path); | 349 params.SetString("gaiaPath", eafe_path); |
| 350 } | 350 } |
| 351 params.SetString("chromeOSApiVersion", "2"); | |
|
achuithb
2017/06/22 01:00:02
Add a comment?
Alexander Alekseev
2017/06/22 01:08:53
Done.
| |
| 351 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 352 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 352 switches::kCrosGaiaApiV1)) { | 353 switches::kCrosGaiaApiV1)) { |
| 353 params.SetString("chromeOSApiVersion", "1"); | 354 params.SetString("chromeOSApiVersion", "1"); |
| 354 } | 355 } |
| 355 | 356 |
| 356 frame_state_ = FRAME_STATE_LOADING; | 357 frame_state_ = FRAME_STATE_LOADING; |
| 357 CallJS("loadAuthExtension", params); | 358 CallJS("loadAuthExtension", params); |
| 358 } | 359 } |
| 359 | 360 |
| 360 void GaiaScreenHandler::ReloadGaia(bool force_reload) { | 361 void GaiaScreenHandler::ReloadGaia(bool force_reload) { |
| (...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 984 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 985 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
| 985 return signin_screen_handler_->delegate_; | 986 return signin_screen_handler_->delegate_; |
| 986 } | 987 } |
| 987 | 988 |
| 988 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 989 bool GaiaScreenHandler::IsRestrictiveProxy() const { |
| 989 return !disable_restrictive_proxy_check_for_test_ && | 990 return !disable_restrictive_proxy_check_for_test_ && |
| 990 !IsOnline(captive_portal_status_); | 991 !IsOnline(captive_portal_status_); |
| 991 } | 992 } |
| 992 | 993 |
| 993 } // namespace chromeos | 994 } // namespace chromeos |
| OLD | NEW |