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

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

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 5 years, 10 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 <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/callback_helpers.h" 15 #include "base/callback_helpers.h"
16 #include "base/command_line.h"
16 #include "base/logging.h" 17 #include "base/logging.h"
17 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
18 #include "base/prefs/pref_registry_simple.h" 19 #include "base/prefs/pref_registry_simple.h"
19 #include "base/prefs/pref_service.h" 20 #include "base/prefs/pref_service.h"
20 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
21 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/browser_process_platform_part.h" 23 #include "chrome/browser/browser_process_platform_part.h"
23 #include "chrome/browser/chrome_notification_types.h" 24 #include "chrome/browser/chrome_notification_types.h"
24 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 25 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
25 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 26 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
26 #include "chrome/browser/chromeos/customization/customization_document.h" 27 #include "chrome/browser/chromeos/customization/customization_document.h"
27 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 28 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
28 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 29 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
29 #include "chrome/browser/chromeos/login/existing_user_controller.h" 30 #include "chrome/browser/chromeos/login/existing_user_controller.h"
30 #include "chrome/browser/chromeos/login/helper.h" 31 #include "chrome/browser/chromeos/login/helper.h"
31 #include "chrome/browser/chromeos/login/hwid_checker.h" 32 #include "chrome/browser/chromeos/login/hwid_checker.h"
32 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" 33 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
33 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" 34 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
34 #include "chrome/browser/chromeos/login/screens/error_screen.h" 35 #include "chrome/browser/chromeos/login/screens/error_screen.h"
35 #include "chrome/browser/chromeos/login/screens/eula_screen.h" 36 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
36 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" 37 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
37 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h" 38 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
38 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h" 39 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h"
40 #include "chrome/browser/chromeos/login/screens/network_error.h"
39 #include "chrome/browser/chromeos/login/screens/network_view.h" 41 #include "chrome/browser/chromeos/login/screens/network_view.h"
40 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 42 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
41 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h" 43 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
42 #include "chrome/browser/chromeos/login/screens/update_screen.h" 44 #include "chrome/browser/chromeos/login/screens/update_screen.h"
43 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 45 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
44 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" 46 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
45 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 47 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
46 #include "chrome/browser/chromeos/login/startup_utils.h" 48 #include "chrome/browser/chromeos/login/startup_utils.h"
47 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h" 49 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
48 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 50 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 return static_cast<ErrorScreen*>(GetScreen(kErrorScreenName)); 290 return static_cast<ErrorScreen*>(GetScreen(kErrorScreenName));
289 } 291 }
290 292
291 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) { 293 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
292 if (screen_name == kNetworkScreenName) { 294 if (screen_name == kNetworkScreenName) {
293 scoped_ptr<NetworkScreen> screen( 295 scoped_ptr<NetworkScreen> screen(
294 new NetworkScreen(this, this, oobe_display_->GetNetworkView())); 296 new NetworkScreen(this, this, oobe_display_->GetNetworkView()));
295 screen->Initialize(nullptr /* context */); 297 screen->Initialize(nullptr /* context */);
296 return screen.release(); 298 return screen.release();
297 } else if (screen_name == kErrorScreenName) { 299 } else if (screen_name == kErrorScreenName) {
298 return new ErrorScreen(this, oobe_display_->GetErrorScreenActor()); 300 scoped_ptr<ErrorScreen> screen(
301 new ErrorScreen(this, oobe_display_->GetNetworkErrorView()));
302 screen->Initialize(nullptr /* context */);
303 return screen.release();
299 } else if (screen_name == kUpdateScreenName) { 304 } else if (screen_name == kUpdateScreenName) {
300 scoped_ptr<UpdateScreen> screen(new UpdateScreen( 305 scoped_ptr<UpdateScreen> screen(new UpdateScreen(
301 this, oobe_display_->GetUpdateView(), remora_controller_.get())); 306 this, oobe_display_->GetUpdateView(), remora_controller_.get()));
302 screen->Initialize(nullptr /* context */); 307 screen->Initialize(nullptr /* context */);
303 return screen.release(); 308 return screen.release();
304 } else if (screen_name == kUserImageScreenName) { 309 } else if (screen_name == kUserImageScreenName) {
305 return new UserImageScreen(this, oobe_display_->GetUserImageView()); 310 return new UserImageScreen(this, oobe_display_->GetUserImageView());
306 } else if (screen_name == kEulaScreenName) { 311 } else if (screen_name == kEulaScreenName) {
307 return new EulaScreen(this, this, oobe_display_->GetEulaView()); 312 return new EulaScreen(this, this, oobe_display_->GetEulaView());
308 } else if (screen_name == kEnrollmentScreenName) { 313 } else if (screen_name == kEnrollmentScreenName) {
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1096 const CrosSettingsProvider::TrustedStatus status = 1101 const CrosSettingsProvider::TrustedStatus status =
1097 CrosSettings::Get()->PrepareTrustedValues(base::Bind( 1102 CrosSettings::Get()->PrepareTrustedValues(base::Bind(
1098 &WizardController::AutoLaunchKioskApp, 1103 &WizardController::AutoLaunchKioskApp,
1099 weak_factory_.GetWeakPtr())); 1104 weak_factory_.GetWeakPtr()));
1100 if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED) 1105 if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
1101 return; 1106 return;
1102 1107
1103 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) { 1108 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
1104 // If the |cros_settings_| are permanently untrusted, show an error message 1109 // If the |cros_settings_| are permanently untrusted, show an error message
1105 // and refuse to auto-launch the kiosk app. 1110 // and refuse to auto-launch the kiosk app.
1106 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR); 1111 GetErrorScreen()->SetUIState(NetworkError::UI_STATE_LOCAL_STATE_ERROR);
1107 SetStatusAreaVisible(false); 1112 SetStatusAreaVisible(false);
1108 ShowErrorScreen(); 1113 ShowErrorScreen();
1109 return; 1114 return;
1110 } 1115 }
1111 1116
1112 bool device_disabled = false; 1117 bool device_disabled = false;
1113 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled); 1118 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
1114 if (device_disabled && system::DeviceDisablingManager:: 1119 if (device_disabled && system::DeviceDisablingManager::
1115 HonorDeviceDisablingDuringNormalOperation()) { 1120 HonorDeviceDisablingDuringNormalOperation()) {
1116 // If the device is disabled, bail out. A device disabled screen will be 1121 // If the device is disabled, bail out. A device disabled screen will be
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 // static 1153 // static
1149 void WizardController::SkipPostLoginScreensForTesting() { 1154 void WizardController::SkipPostLoginScreensForTesting() {
1150 skip_post_login_screens_ = true; 1155 skip_post_login_screens_ = true;
1151 } 1156 }
1152 1157
1153 void WizardController::OnLocalStateInitialized(bool /* succeeded */) { 1158 void WizardController::OnLocalStateInitialized(bool /* succeeded */) {
1154 if (GetLocalState()->GetInitializationStatus() != 1159 if (GetLocalState()->GetInitializationStatus() !=
1155 PrefService::INITIALIZATION_STATUS_ERROR) { 1160 PrefService::INITIALIZATION_STATUS_ERROR) {
1156 return; 1161 return;
1157 } 1162 }
1158 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR); 1163 GetErrorScreen()->SetUIState(NetworkError::UI_STATE_LOCAL_STATE_ERROR);
1159 SetStatusAreaVisible(false); 1164 SetStatusAreaVisible(false);
1160 ShowErrorScreen(); 1165 ShowErrorScreen();
1161 } 1166 }
1162 1167
1163 PrefService* WizardController::GetLocalState() { 1168 PrefService* WizardController::GetLocalState() {
1164 if (local_state_for_testing_) 1169 if (local_state_for_testing_)
1165 return local_state_for_testing_; 1170 return local_state_for_testing_;
1166 return g_browser_process->local_state(); 1171 return g_browser_process->local_state();
1167 } 1172 }
1168 1173
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1300 } 1305 }
1301 1306
1302 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1307 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1303 screen->SetParameters(effective_config, shark_controller_.get(), 1308 screen->SetParameters(effective_config, shark_controller_.get(),
1304 remora_controller_.get()); 1309 remora_controller_.get());
1305 SetStatusAreaVisible(true); 1310 SetStatusAreaVisible(true);
1306 SetCurrentScreen(screen); 1311 SetCurrentScreen(screen);
1307 } 1312 }
1308 1313
1309 } // namespace chromeos 1314 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698