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

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: cleanup 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 "base/threading/thread_restrictions.h" 22 #include "base/threading/thread_restrictions.h"
22 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/browser_process_platform_part.h" 24 #include "chrome/browser/browser_process_platform_part.h"
24 #include "chrome/browser/chrome_notification_types.h" 25 #include "chrome/browser/chrome_notification_types.h"
25 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 26 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
26 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 27 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
27 #include "chrome/browser/chromeos/customization/customization_document.h" 28 #include "chrome/browser/chromeos/customization/customization_document.h"
28 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h" 29 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen. h"
29 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 30 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
30 #include "chrome/browser/chromeos/login/existing_user_controller.h" 31 #include "chrome/browser/chromeos/login/existing_user_controller.h"
31 #include "chrome/browser/chromeos/login/helper.h" 32 #include "chrome/browser/chromeos/login/helper.h"
32 #include "chrome/browser/chromeos/login/hwid_checker.h" 33 #include "chrome/browser/chromeos/login/hwid_checker.h"
33 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h" 34 #include "chrome/browser/chromeos/login/screens/device_disabled_screen.h"
34 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h" 35 #include "chrome/browser/chromeos/login/screens/enable_debugging_screen.h"
35 #include "chrome/browser/chromeos/login/screens/error_screen.h" 36 #include "chrome/browser/chromeos/login/screens/error_screen.h"
36 #include "chrome/browser/chromeos/login/screens/eula_screen.h" 37 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
37 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" 38 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
38 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h" 39 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
39 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h" 40 #include "chrome/browser/chromeos/login/screens/kiosk_enable_screen.h"
41 #include "chrome/browser/chromeos/login/screens/network_error.h"
40 #include "chrome/browser/chromeos/login/screens/network_view.h" 42 #include "chrome/browser/chromeos/login/screens/network_view.h"
41 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 43 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
42 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h" 44 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
43 #include "chrome/browser/chromeos/login/screens/update_screen.h" 45 #include "chrome/browser/chromeos/login/screens/update_screen.h"
44 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 46 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
45 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" 47 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
46 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 48 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
47 #include "chrome/browser/chromeos/login/startup_utils.h" 49 #include "chrome/browser/chromeos/login/startup_utils.h"
48 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h" 50 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
49 #include "chrome/browser/chromeos/login/ui/login_display_host.h" 51 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 return static_cast<ErrorScreen*>(GetScreen(kErrorScreenName)); 283 return static_cast<ErrorScreen*>(GetScreen(kErrorScreenName));
282 } 284 }
283 285
284 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) { 286 BaseScreen* WizardController::CreateScreen(const std::string& screen_name) {
285 if (screen_name == kNetworkScreenName) { 287 if (screen_name == kNetworkScreenName) {
286 scoped_ptr<NetworkScreen> screen( 288 scoped_ptr<NetworkScreen> screen(
287 new NetworkScreen(this, this, oobe_display_->GetNetworkView())); 289 new NetworkScreen(this, this, oobe_display_->GetNetworkView()));
288 screen->Initialize(nullptr /* context */); 290 screen->Initialize(nullptr /* context */);
289 return screen.release(); 291 return screen.release();
290 } else if (screen_name == kErrorScreenName) { 292 } else if (screen_name == kErrorScreenName) {
291 return new ErrorScreen(this, oobe_display_->GetErrorScreenActor()); 293 scoped_ptr<ErrorScreen> screen(
294 new ErrorScreen(this, oobe_display_->GetNetworkErrorView()));
295 screen->Initialize(nullptr /* context */);
296 return screen.release();
292 } else if (screen_name == kUpdateScreenName) { 297 } else if (screen_name == kUpdateScreenName) {
293 scoped_ptr<UpdateScreen> screen(new UpdateScreen( 298 scoped_ptr<UpdateScreen> screen(new UpdateScreen(
294 this, oobe_display_->GetUpdateView(), remora_controller_.get())); 299 this, oobe_display_->GetUpdateView(), remora_controller_.get()));
295 screen->Initialize(nullptr /* context */); 300 screen->Initialize(nullptr /* context */);
296 return screen.release(); 301 return screen.release();
297 } else if (screen_name == kUserImageScreenName) { 302 } else if (screen_name == kUserImageScreenName) {
298 return new UserImageScreen(this, oobe_display_->GetUserImageView()); 303 return new UserImageScreen(this, oobe_display_->GetUserImageView());
299 } else if (screen_name == kEulaScreenName) { 304 } else if (screen_name == kEulaScreenName) {
300 return new EulaScreen(this, this, oobe_display_->GetEulaView()); 305 return new EulaScreen(this, this, oobe_display_->GetEulaView());
301 } else if (screen_name == kEnrollmentScreenName) { 306 } else if (screen_name == kEnrollmentScreenName) {
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
1089 const CrosSettingsProvider::TrustedStatus status = 1094 const CrosSettingsProvider::TrustedStatus status =
1090 CrosSettings::Get()->PrepareTrustedValues(base::Bind( 1095 CrosSettings::Get()->PrepareTrustedValues(base::Bind(
1091 &WizardController::AutoLaunchKioskApp, 1096 &WizardController::AutoLaunchKioskApp,
1092 weak_factory_.GetWeakPtr())); 1097 weak_factory_.GetWeakPtr()));
1093 if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED) 1098 if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
1094 return; 1099 return;
1095 1100
1096 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) { 1101 if (status == CrosSettingsProvider::PERMANENTLY_UNTRUSTED) {
1097 // If the |cros_settings_| are permanently untrusted, show an error message 1102 // If the |cros_settings_| are permanently untrusted, show an error message
1098 // and refuse to auto-launch the kiosk app. 1103 // and refuse to auto-launch the kiosk app.
1099 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR); 1104 GetErrorScreen()->SetUIState(NetworkError::UI_STATE_LOCAL_STATE_ERROR);
1100 SetStatusAreaVisible(false); 1105 SetStatusAreaVisible(false);
1101 ShowErrorScreen(); 1106 ShowErrorScreen();
1102 return; 1107 return;
1103 } 1108 }
1104 1109
1105 bool device_disabled = false; 1110 bool device_disabled = false;
1106 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled); 1111 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled);
1107 if (device_disabled && system::DeviceDisablingManager:: 1112 if (device_disabled && system::DeviceDisablingManager::
1108 HonorDeviceDisablingDuringNormalOperation()) { 1113 HonorDeviceDisablingDuringNormalOperation()) {
1109 // If the device is disabled, bail out. A device disabled screen will be 1114 // 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
1141 // static 1146 // static
1142 void WizardController::SkipPostLoginScreensForTesting() { 1147 void WizardController::SkipPostLoginScreensForTesting() {
1143 skip_post_login_screens_ = true; 1148 skip_post_login_screens_ = true;
1144 } 1149 }
1145 1150
1146 void WizardController::OnLocalStateInitialized(bool /* succeeded */) { 1151 void WizardController::OnLocalStateInitialized(bool /* succeeded */) {
1147 if (GetLocalState()->GetInitializationStatus() != 1152 if (GetLocalState()->GetInitializationStatus() !=
1148 PrefService::INITIALIZATION_STATUS_ERROR) { 1153 PrefService::INITIALIZATION_STATUS_ERROR) {
1149 return; 1154 return;
1150 } 1155 }
1151 GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_LOCAL_STATE_ERROR); 1156 GetErrorScreen()->SetUIState(NetworkError::UI_STATE_LOCAL_STATE_ERROR);
1152 SetStatusAreaVisible(false); 1157 SetStatusAreaVisible(false);
1153 ShowErrorScreen(); 1158 ShowErrorScreen();
1154 } 1159 }
1155 1160
1156 PrefService* WizardController::GetLocalState() { 1161 PrefService* WizardController::GetLocalState() {
1157 if (local_state_for_testing_) 1162 if (local_state_for_testing_)
1158 return local_state_for_testing_; 1163 return local_state_for_testing_;
1159 return g_browser_process->local_state(); 1164 return g_browser_process->local_state();
1160 } 1165 }
1161 1166
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 } 1298 }
1294 1299
1295 EnrollmentScreen* screen = EnrollmentScreen::Get(this); 1300 EnrollmentScreen* screen = EnrollmentScreen::Get(this);
1296 screen->SetParameters(effective_config, shark_controller_.get(), 1301 screen->SetParameters(effective_config, shark_controller_.get(),
1297 remora_controller_.get()); 1302 remora_controller_.get());
1298 SetStatusAreaVisible(true); 1303 SetStatusAreaVisible(true);
1299 SetCurrentScreen(screen); 1304 SetCurrentScreen(screen);
1300 } 1305 }
1301 1306
1302 } // namespace chromeos 1307 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698