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

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

Issue 2710673003: cros: Remove usage of GaiaScreenHandler outside of login/webui. (Closed)
Patch Set: Initial upload Created 3 years, 10 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 35f56390f59ce7f4fe4a55ab71ca69f05e41f1c7..3029b7e1192cfdf12bd330b44d0b70de09d3d633 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -240,6 +240,33 @@ GaiaScreenHandler::~GaiaScreenHandler() {
network_portal_detector_->RemoveObserver(this);
}
+void GaiaScreenHandler::MaybePreloadAuthExtension() {
+ VLOG(1) << "MaybePreloadAuthExtension";
+
+ if (!network_portal_detector_) {
+ NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl(
+ g_browser_process->system_request_context(), false);
+ detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
+ network_portal_detector_.reset(detector);
+ network_portal_detector_->AddObserver(this);
+ network_portal_detector_->Enable(true);
+ }
+
+ // If cookies clearing was initiated or |dns_clear_task_running_| then auth
+ // extension showing has already been initiated and preloading is pointless.
+ if (signin_screen_handler_->ShouldLoadGaia() && !gaia_silent_load_ &&
+ !cookies_cleared_ && !dns_clear_task_running_ &&
+ network_state_informer_->state() == NetworkStateInformer::ONLINE) {
+ gaia_silent_load_ = true;
+ gaia_silent_load_network_ = network_state_informer_->network_path();
+ LoadAuthExtension(true /* force */, false /* offline */);
+ }
+}
+
+void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
+ disable_restrictive_proxy_check_for_test_ = true;
+}
+
void GaiaScreenHandler::LoadGaia(const GaiaContext& context) {
base::PostTaskWithTraitsAndReplyWithResult(
FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
@@ -893,31 +920,6 @@ void GaiaScreenHandler::ShowGaiaScreenIfReady() {
}
}
-void GaiaScreenHandler::MaybePreloadAuthExtension() {
- VLOG(1) << "MaybePreloadAuthExtension";
-
- if (!network_portal_detector_) {
- NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl(
- g_browser_process->system_request_context(), false);
- detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
- network_portal_detector_.reset(detector);
- network_portal_detector_->AddObserver(this);
- network_portal_detector_->Enable(true);
- }
-
- // If cookies clearing was initiated or |dns_clear_task_running_| then auth
- // extension showing has already been initiated and preloading is pointless.
- if (signin_screen_handler_->ShouldLoadGaia() &&
- !gaia_silent_load_ &&
- !cookies_cleared_ &&
- !dns_clear_task_running_ &&
- network_state_informer_->state() == NetworkStateInformer::ONLINE) {
- gaia_silent_load_ = true;
- gaia_silent_load_network_ = network_state_informer_->network_path();
- LoadAuthExtension(true /* force */, false /* offline */);
- }
-}
-
void GaiaScreenHandler::ShowWhitelistCheckFailedError() {
base::DictionaryValue params;
params.SetBoolean("enterpriseManaged",
@@ -974,8 +976,4 @@ bool GaiaScreenHandler::IsRestrictiveProxy() const {
!IsOnline(captive_portal_status_);
}
-void GaiaScreenHandler::DisableRestrictiveProxyCheckForTest() {
- disable_restrictive_proxy_check_for_test_ = true;
-}
-
} // namespace chromeos
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698