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 "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 base::DictionaryValue params; | 180 base::DictionaryValue params; |
181 UpdateAuthParams(¶ms, context.has_users); | 181 UpdateAuthParams(¶ms, context.has_users); |
182 CallJS("updateAuthExtension", params); | 182 CallJS("updateAuthExtension", params); |
183 } | 183 } |
184 | 184 |
185 void GaiaScreenHandler::ReloadGaia() { | 185 void GaiaScreenHandler::ReloadGaia() { |
186 if (frame_state_ == FRAME_STATE_LOADING) | 186 if (frame_state_ == FRAME_STATE_LOADING) |
187 return; | 187 return; |
188 NetworkStateInformer::State state = network_state_informer_->state(); | 188 NetworkStateInformer::State state = network_state_informer_->state(); |
189 if (state != NetworkStateInformer::ONLINE) { | 189 if (state != NetworkStateInformer::ONLINE) { |
190 LOG(WARNING) << "Skipping reloading of Gaia since " | 190 VLOG(1) << "Skipping reloading of Gaia since network state=" |
191 << "network state=" | 191 << NetworkStateInformer::StatusString(state); |
192 << NetworkStateInformer::StatusString(state); | |
193 return; | 192 return; |
194 } | 193 } |
195 LOG(WARNING) << "Reloading Gaia."; | 194 VLOG(1) << "Reloading Gaia."; |
196 frame_state_ = FRAME_STATE_LOADING; | 195 frame_state_ = FRAME_STATE_LOADING; |
197 CallJS("doReload"); | 196 CallJS("doReload"); |
198 } | 197 } |
199 | 198 |
200 void GaiaScreenHandler::DeclareLocalizedValues( | 199 void GaiaScreenHandler::DeclareLocalizedValues( |
201 LocalizedValuesBuilder* builder) { | 200 LocalizedValuesBuilder* builder) { |
202 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE); | 201 builder->Add("signinScreenTitle", IDS_SIGNIN_SCREEN_TITLE); |
203 builder->Add("signinScreenPasswordChanged", | 202 builder->Add("signinScreenPasswordChanged", |
204 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED); | 203 IDS_SIGNIN_SCREEN_PASSWORD_CHANGED); |
205 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); | 204 builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML); |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 // used. | 489 // used. |
491 gaia_silent_load_ = false; | 490 gaia_silent_load_ = false; |
492 if (focus_stolen_) | 491 if (focus_stolen_) |
493 HandleGaiaUIReady(); | 492 HandleGaiaUIReady(); |
494 } | 493 } |
495 | 494 |
496 signin_screen_handler_->UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE); | 495 signin_screen_handler_->UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE); |
497 } | 496 } |
498 | 497 |
499 void GaiaScreenHandler::MaybePreloadAuthExtension() { | 498 void GaiaScreenHandler::MaybePreloadAuthExtension() { |
500 LOG(WARNING) << "MaybePreloadAuthExtension() call."; | 499 VLOG(1) << "MaybePreloadAuthExtension() call."; |
501 | 500 |
502 // If cookies clearing was initiated or |dns_clear_task_running_| then auth | 501 // If cookies clearing was initiated or |dns_clear_task_running_| then auth |
503 // extension showing has already been initiated and preloading is senseless. | 502 // extension showing has already been initiated and preloading is senseless. |
504 if (signin_screen_handler_->ShouldLoadGaia() && | 503 if (signin_screen_handler_->ShouldLoadGaia() && |
505 !gaia_silent_load_ && | 504 !gaia_silent_load_ && |
506 !cookies_cleared_ && | 505 !cookies_cleared_ && |
507 !dns_clear_task_running_ && | 506 !dns_clear_task_running_ && |
508 network_state_informer_->state() == NetworkStateInformer::ONLINE) { | 507 network_state_informer_->state() == NetworkStateInformer::ONLINE) { |
509 gaia_silent_load_ = true; | 508 gaia_silent_load_ = true; |
510 gaia_silent_load_network_ = network_state_informer_->network_path(); | 509 gaia_silent_load_network_ = network_state_informer_->network_path(); |
(...skipping 28 matching lines...) Expand all Loading... |
539 | 538 |
540 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { | 539 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { |
541 DCHECK(signin_screen_handler_); | 540 DCHECK(signin_screen_handler_); |
542 return signin_screen_handler_->delegate_; | 541 return signin_screen_handler_->delegate_; |
543 } | 542 } |
544 | 543 |
545 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { | 544 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { |
546 signin_screen_handler_ = handler; | 545 signin_screen_handler_ = handler; |
547 } | 546 } |
548 } // namespace chromeos | 547 } // namespace chromeos |
OLD | NEW |