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

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

Issue 2281813002: ChromeOS: Restrict material-design OOBE to compatible devices only. (Closed)
Patch Set: Created 4 years, 3 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 | chrome/browser/ui/webui/chromeos/login/oobe_ui.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 898 matching lines...) Expand 10 before | Expand all | Expand 10 after
909 } 909 }
910 } 910 }
911 911
912 void WizardController::SetStatusAreaVisible(bool visible) { 912 void WizardController::SetStatusAreaVisible(bool visible) {
913 host_->SetStatusAreaVisible(visible); 913 host_->SetStatusAreaVisible(visible);
914 } 914 }
915 915
916 void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) { 916 void WizardController::OnHIDScreenNecessityCheck(bool screen_needed) {
917 if (!oobe_ui_) 917 if (!oobe_ui_)
918 return; 918 return;
919 if (screen_needed) 919
920 if (screen_needed) {
920 ShowHIDDetectionScreen(); 921 ShowHIDDetectionScreen();
921 else 922 } else {
923 oobe_ui_->EnableMdOobe();
922 ShowNetworkScreen(); 924 ShowNetworkScreen();
925 }
923 } 926 }
924 927
925 void WizardController::AdvanceToScreen(const std::string& screen_name) { 928 void WizardController::AdvanceToScreen(const std::string& screen_name) {
926 if (screen_name == kNetworkScreenName) { 929 if (screen_name == kNetworkScreenName) {
927 ShowNetworkScreen(); 930 ShowNetworkScreen();
928 } else if (screen_name == kLoginScreenName) { 931 } else if (screen_name == kLoginScreenName) {
929 ShowLoginScreen(LoginScreenContext()); 932 ShowLoginScreen(LoginScreenContext());
930 } else if (screen_name == kUpdateScreenName) { 933 } else if (screen_name == kUpdateScreenName) {
931 InitiateOOBEUpdate(); 934 InitiateOOBEUpdate();
932 } else if (screen_name == kUserImageScreenName) { 935 } else if (screen_name == kUserImageScreenName) {
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 time_oobe_started_ = base::Time::Now(); 969 time_oobe_started_ = base::Time::Now();
967 if (IsRemoraPairingOobe() || IsControllerDetected()) { 970 if (IsRemoraPairingOobe() || IsControllerDetected()) {
968 ShowHostPairingScreen(); 971 ShowHostPairingScreen();
969 } else if (CanShowHIDDetectionScreen()) { 972 } else if (CanShowHIDDetectionScreen()) {
970 hid_screen_ = GetScreen(kHIDDetectionScreenName); 973 hid_screen_ = GetScreen(kHIDDetectionScreenName);
971 base::Callback<void(bool)> on_check = base::Bind( 974 base::Callback<void(bool)> on_check = base::Bind(
972 &WizardController::OnHIDScreenNecessityCheck, 975 &WizardController::OnHIDScreenNecessityCheck,
973 weak_factory_.GetWeakPtr()); 976 weak_factory_.GetWeakPtr());
974 oobe_ui_->GetHIDDetectionView()->CheckIsScreenRequired(on_check); 977 oobe_ui_->GetHIDDetectionView()->CheckIsScreenRequired(on_check);
975 } else { 978 } else {
979 oobe_ui_->EnableMdOobe();
976 ShowNetworkScreen(); 980 ShowNetworkScreen();
977 } 981 }
978 } else { 982 } else {
979 ShowLoginScreen(LoginScreenContext()); 983 ShowLoginScreen(LoginScreenContext());
980 } 984 }
981 } 985 }
982 } 986 }
983 987
984 /////////////////////////////////////////////////////////////////////////////// 988 ///////////////////////////////////////////////////////////////////////////////
985 // WizardController, BaseScreenDelegate overrides: 989 // WizardController, BaseScreenDelegate overrides:
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT; 1404 : policy::EnrollmentConfig::MODE_MANUAL_REENROLLMENT;
1401 } 1405 }
1402 1406
1403 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1407 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1404 screen->SetParameters(effective_config, shark_controller_.get()); 1408 screen->SetParameters(effective_config, shark_controller_.get());
1405 SetStatusAreaVisible(true); 1409 SetStatusAreaVisible(true);
1406 SetCurrentScreen(screen); 1410 SetCurrentScreen(screen);
1407 } 1411 }
1408 1412
1409 } // namespace chromeos 1413 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/oobe_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698