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

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

Issue 2928513004: cros: Do not initialize gaia portal detector if not loading gaia (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 67f3955d0cff065655c886d05f624affa67a4076..6c52d63f3a81f565ab959b8444916103c2b6b552 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -243,7 +243,8 @@ GaiaScreenHandler::~GaiaScreenHandler() {
void GaiaScreenHandler::MaybePreloadAuthExtension() {
VLOG(1) << "MaybePreloadAuthExtension";
- if (!network_portal_detector_) {
+ if (!network_portal_detector_ &&
+ !user_manager::UserManager::Get()->IsUserLoggedIn()) {
xiyuan 2017/06/06 21:54:29 Maybe move ShouldLoadGaia() before this and bail o
jdufault 2017/06/06 21:58:37 Add a comment explaining why we need this special
Qiang(Joe) Xu 2017/06/06 22:51:09 Done.
Qiang(Joe) Xu 2017/06/06 22:51:09 Done.
NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl(
g_browser_process->system_request_context(), false);
detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698