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

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

Issue 539273002: Added UI to enable debugging features on CrOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 639
640 if (gaia_silent_load_) { 640 if (gaia_silent_load_) {
641 // The variable is assigned to false because silently loaded Gaia page was 641 // The variable is assigned to false because silently loaded Gaia page was
642 // used. 642 // used.
643 gaia_silent_load_ = false; 643 gaia_silent_load_ = false;
644 if (focus_stolen_) 644 if (focus_stolen_)
645 HandleGaiaUIReady(); 645 HandleGaiaUIReady();
646 } 646 }
647 signin_screen_handler_->UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE); 647 signin_screen_handler_->UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
648 648
649 PrefService* prefs = g_browser_process->local_state(); 649 if (core_oobe_actor_) {
650 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) { 650 PrefService* prefs = g_browser_process->local_state();
651 if (core_oobe_actor_) 651 if (prefs->GetBoolean(prefs::kFactoryResetRequested)) {
652 core_oobe_actor_->ShowDeviceResetScreen(); 652 core_oobe_actor_->ShowDeviceResetScreen();
653 } else if (prefs->GetBoolean(prefs::kDebuggingFeaturesRequested)) {
654 core_oobe_actor_->ShowEnableDebuggingScreen();
655 }
653 } 656 }
654 } 657 }
655 658
656 void GaiaScreenHandler::MaybePreloadAuthExtension() { 659 void GaiaScreenHandler::MaybePreloadAuthExtension() {
657 VLOG(1) << "MaybePreloadAuthExtension() call."; 660 VLOG(1) << "MaybePreloadAuthExtension() call.";
658 661
659 // If cookies clearing was initiated or |dns_clear_task_running_| then auth 662 // If cookies clearing was initiated or |dns_clear_task_running_| then auth
660 // extension showing has already been initiated and preloading is senseless. 663 // extension showing has already been initiated and preloading is senseless.
661 if (signin_screen_handler_->ShouldLoadGaia() && 664 if (signin_screen_handler_->ShouldLoadGaia() &&
662 !gaia_silent_load_ && 665 !gaia_silent_load_ &&
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 705
703 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() { 706 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
704 DCHECK(signin_screen_handler_); 707 DCHECK(signin_screen_handler_);
705 return signin_screen_handler_->delegate_; 708 return signin_screen_handler_->delegate_;
706 } 709 }
707 710
708 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) { 711 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
709 signin_screen_handler_ = handler; 712 signin_screen_handler_ = handler;
710 } 713 }
711 } // namespace chromeos 714 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698