| Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| index 92adcb52bd35ca703e52db9366338ebebe8c34d7..5f9149a75339a6bc28e224d859dedd455e26013d 100644
|
| --- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| +++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
|
| @@ -917,10 +917,17 @@ SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
|
| }
|
|
|
| bool GaiaScreenHandler::IsRestrictiveProxy() const {
|
| + if (disable_restrictive_proxy_check_)
|
| + return false;
|
| +
|
| return captive_portal_status_ ==
|
| NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL ||
|
| captive_portal_status_ ==
|
| NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE;
|
| }
|
|
|
| +void GaiaScreenHandler::DisableRestrictiveProxyCheck() {
|
| + disable_restrictive_proxy_check_ = true;
|
| +}
|
| +
|
| } // namespace chromeos
|
|
|