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

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

Issue 1971743004: [Merge to M50] Reset BluetoothHostPairingController in an earlier stage for normal user login flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
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
« no previous file with comments | « no previous file | components/pairing/bluetooth_host_pairing_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 if (oobe_marked_completed_) { 831 if (oobe_marked_completed_) {
832 return; 832 return;
833 } 833 }
834 834
835 UMA_HISTOGRAM_COUNTS_100( 835 UMA_HISTOGRAM_COUNTS_100(
836 "HIDDetection.TimesDialogShownPerOOBECompleted", 836 "HIDDetection.TimesDialogShownPerOOBECompleted",
837 GetLocalState()->GetInteger(prefs::kTimesHIDDialogShown)); 837 GetLocalState()->GetInteger(prefs::kTimesHIDDialogShown));
838 GetLocalState()->ClearPref(prefs::kTimesHIDDialogShown); 838 GetLocalState()->ClearPref(prefs::kTimesHIDDialogShown);
839 StartupUtils::MarkOobeCompleted(); 839 StartupUtils::MarkOobeCompleted();
840 oobe_marked_completed_ = true; 840 oobe_marked_completed_ = true;
841
842 if (shark_connection_listener_.get())
843 shark_connection_listener_->ResetHostPairingController();
841 } 844 }
842 845
843 void WizardController::SetCurrentScreen(BaseScreen* new_current) { 846 void WizardController::SetCurrentScreen(BaseScreen* new_current) {
844 SetCurrentScreenSmooth(new_current, false); 847 SetCurrentScreenSmooth(new_current, false);
845 } 848 }
846 849
847 void WizardController::ShowCurrentScreen() { 850 void WizardController::ShowCurrentScreen() {
848 // ShowCurrentScreen may get called by smooth_show_timer_ even after 851 // ShowCurrentScreen may get called by smooth_show_timer_ even after
849 // flow has been switched to sign in screen (ExistingUserController). 852 // flow has been switched to sign in screen (ExistingUserController).
850 if (!oobe_display_) 853 if (!oobe_display_)
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
1371 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1374 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1372 } 1375 }
1373 1376
1374 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1377 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1375 screen->SetParameters(effective_config, shark_controller_.get()); 1378 screen->SetParameters(effective_config, shark_controller_.get());
1376 SetStatusAreaVisible(true); 1379 SetStatusAreaVisible(true);
1377 SetCurrentScreen(screen); 1380 SetCurrentScreen(screen);
1378 } 1381 }
1379 1382
1380 } // namespace chromeos 1383 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | components/pairing/bluetooth_host_pairing_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698