Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6300)

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

Issue 1386523002: browser test for kAccountsPrefAllowNewUser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698