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

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

Issue 1372813005: Remove unused UserSettingsChanged and UpdateGaia. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
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 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 params.SetString("gaiaUrl", eafe_url); 290 params.SetString("gaiaUrl", eafe_url);
291 params.SetString("gaiaPath", eafe_path); 291 params.SetString("gaiaPath", eafe_path);
292 params.SetString("clientId", 292 params.SetString("clientId",
293 GaiaUrls::GetInstance()->oauth2_chrome_client_id()); 293 GaiaUrls::GetInstance()->oauth2_chrome_client_id());
294 } 294 }
295 295
296 frame_state_ = FRAME_STATE_LOADING; 296 frame_state_ = FRAME_STATE_LOADING;
297 CallJS("loadAuthExtension", params); 297 CallJS("loadAuthExtension", params);
298 } 298 }
299 299
300 void GaiaScreenHandler::UpdateGaia(const GaiaContext& context) {
301 base::DictionaryValue params;
302 UpdateAuthParams(&params, context.has_users,
303 context.is_enrolling_consumer_management);
304 CallJS("updateAuthExtension", params);
305 }
306
307 void GaiaScreenHandler::ReloadGaia(bool force_reload) { 300 void GaiaScreenHandler::ReloadGaia(bool force_reload) {
308 if (frame_state_ == FRAME_STATE_LOADING && !force_reload) { 301 if (frame_state_ == FRAME_STATE_LOADING && !force_reload) {
309 VLOG(1) << "Skipping reloading of Gaia since gaia is loading."; 302 VLOG(1) << "Skipping reloading of Gaia since gaia is loading.";
310 return; 303 return;
311 } 304 }
312 NetworkStateInformer::State state = network_state_informer_->state(); 305 NetworkStateInformer::State state = network_state_informer_->state();
313 if (state != NetworkStateInformer::ONLINE) { 306 if (state != NetworkStateInformer::ONLINE) {
314 VLOG(1) << "Skipping reloading of Gaia since network state=" 307 VLOG(1) << "Skipping reloading of Gaia since network state="
315 << NetworkStateInformer::StatusString(state); 308 << NetworkStateInformer::StatusString(state);
316 return; 309 return;
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) { 875 void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
883 if (signin_screen_handler_) 876 if (signin_screen_handler_)
884 signin_screen_handler_->UpdateState(reason); 877 signin_screen_handler_->UpdateState(reason);
885 } 878 }
886 879
887 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 880 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
888 return signin_screen_handler_->delegate_; 881 return signin_screen_handler_->delegate_;
889 } 882 }
890 883
891 } // namespace chromeos 884 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698