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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller.cc

Issue 1958393002: Reset BluetoothHostPairingController in an earlier stage for normal user login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <sys/types.h> 10 #include <sys/types.h>
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
839 if (oobe_marked_completed_) { 839 if (oobe_marked_completed_) {
840 return; 840 return;
841 } 841 }
842 842
843 UMA_HISTOGRAM_COUNTS_100( 843 UMA_HISTOGRAM_COUNTS_100(
844 "HIDDetection.TimesDialogShownPerOOBECompleted", 844 "HIDDetection.TimesDialogShownPerOOBECompleted",
845 GetLocalState()->GetInteger(prefs::kTimesHIDDialogShown)); 845 GetLocalState()->GetInteger(prefs::kTimesHIDDialogShown));
846 GetLocalState()->ClearPref(prefs::kTimesHIDDialogShown); 846 GetLocalState()->ClearPref(prefs::kTimesHIDDialogShown);
847 StartupUtils::MarkOobeCompleted(); 847 StartupUtils::MarkOobeCompleted();
848 oobe_marked_completed_ = true; 848 oobe_marked_completed_ = true;
849
850 if (shark_connection_listener_.get())
851 shark_connection_listener_->ResetHostPairingController();
849 } 852 }
850 853
851 void WizardController::SetCurrentScreen(BaseScreen* new_current) { 854 void WizardController::SetCurrentScreen(BaseScreen* new_current) {
852 SetCurrentScreenSmooth(new_current, false); 855 SetCurrentScreenSmooth(new_current, false);
853 } 856 }
854 857
855 void WizardController::ShowCurrentScreen() { 858 void WizardController::ShowCurrentScreen() {
856 // ShowCurrentScreen may get called by smooth_show_timer_ even after 859 // ShowCurrentScreen may get called by smooth_show_timer_ even after
857 // flow has been switched to sign in screen (ExistingUserController). 860 // flow has been switched to sign in screen (ExistingUserController).
858 if (!oobe_ui_) 861 if (!oobe_ui_)
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1382 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1380 } 1383 }
1381 1384
1382 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1385 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1383 screen->SetParameters(effective_config, shark_controller_.get()); 1386 screen->SetParameters(effective_config, shark_controller_.get());
1384 SetStatusAreaVisible(true); 1387 SetStatusAreaVisible(true);
1385 SetCurrentScreen(screen); 1388 SetCurrentScreen(screen);
1386 } 1389 }
1387 1390
1388 } // namespace chromeos 1391 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | components/pairing/bluetooth_host_pairing_controller.h » ('j') | components/pairing/shark_connection_listener.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698