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/chromeos/devicetype_utils.h" | 7 #include "ash/system/chromeos/devicetype_utils.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/guid.h" | 9 #include "base/guid.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 899 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
910 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) { | 910 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) { |
911 if (signin_screen_handler_) | 911 if (signin_screen_handler_) |
912 signin_screen_handler_->UpdateState(reason); | 912 signin_screen_handler_->UpdateState(reason); |
913 } | 913 } |
914 | 914 |
915 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 915 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
916 return signin_screen_handler_->delegate_; | 916 return signin_screen_handler_->delegate_; |
917 } | 917 } |
918 | 918 |
919 bool GaiaScreenHandler::IsRestrictiveProxy() const { | 919 bool GaiaScreenHandler::IsRestrictiveProxy() const { |
| 920 if (disable_restrictive_proxy_check_for_test_) |
| 921 return false; |
| 922 |
920 return captive_portal_status_ == | 923 return captive_portal_status_ == |
921 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL || | 924 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL || |
922 captive_portal_status_ == | 925 captive_portal_status_ == |
923 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE; | 926 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE; |
924 } | 927 } |
925 | 928 |
| 929 void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() { |
| 930 disable_restrictive_proxy_check_for_test_ = true; |
| 931 } |
| 932 |
926 } // namespace chromeos | 933 } // namespace chromeos |
OLD | NEW |