| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/supervised/supervised_user_creation_scre
en.h" | 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre
en.h" |
| 6 | 6 |
| 7 #include "ash/desktop_background/desktop_background_controller.h" | 7 #include "ash/desktop_background/desktop_background_controller.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| 11 #include "chrome/browser/chromeos/camera_detector.h" | 11 #include "chrome/browser/chromeos/camera_detector.h" |
| 12 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" | 12 #include "chrome/browser/chromeos/login/error_screens_histogram_helper.h" |
| 13 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 13 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 14 #include "chrome/browser/chromeos/login/screen_manager.h" | 14 #include "chrome/browser/chromeos/login/screen_manager.h" |
| 15 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" | 15 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h" |
| 16 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 16 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 17 #include "chrome/browser/chromeos/login/screens/network_error.h" |
| 17 #include "chrome/browser/chromeos/login/signin_specifics.h" | 18 #include "chrome/browser/chromeos/login/signin_specifics.h" |
| 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" | 20 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" |
| 20 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" | 21 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" |
| 21 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" | 22 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow
.h" |
| 22 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 23 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 23 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 24 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 24 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 25 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 25 #include "chrome/browser/chromeos/login/wizard_controller.h" | 26 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 26 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" | 27 #include "chrome/browser/supervised_user/legacy/supervised_user_shared_settings_
service.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 | 64 |
| 64 void ConfigureErrorScreen(ErrorScreen* screen, | 65 void ConfigureErrorScreen(ErrorScreen* screen, |
| 65 const NetworkState* network, | 66 const NetworkState* network, |
| 66 const NetworkPortalDetector::CaptivePortalStatus status) { | 67 const NetworkPortalDetector::CaptivePortalStatus status) { |
| 67 switch (status) { | 68 switch (status) { |
| 68 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN: | 69 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN: |
| 69 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE: | 70 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE: |
| 70 NOTREACHED(); | 71 NOTREACHED(); |
| 71 break; | 72 break; |
| 72 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE: | 73 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE: |
| 73 screen->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE, | 74 screen->SetErrorState(NetworkError::ERROR_STATE_OFFLINE, std::string()); |
| 74 std::string()); | |
| 75 break; | 75 break; |
| 76 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL: | 76 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL: |
| 77 screen->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL, | 77 screen->SetErrorState(NetworkError::ERROR_STATE_PORTAL, |
| 78 network ? network->name() : std::string()); | 78 network ? network->name() : std::string()); |
| 79 screen->FixCaptivePortal(); | 79 screen->FixCaptivePortal(); |
| 80 break; | 80 break; |
| 81 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED: | 81 case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED: |
| 82 screen->SetErrorState(ErrorScreen::ERROR_STATE_PROXY, | 82 screen->SetErrorState(NetworkError::ERROR_STATE_PROXY, std::string()); |
| 83 std::string()); | |
| 84 break; | 83 break; |
| 85 default: | 84 default: |
| 86 NOTREACHED(); | 85 NOTREACHED(); |
| 87 break; | 86 break; |
| 88 } | 87 } |
| 89 } | 88 } |
| 90 | 89 |
| 91 } // namespace | 90 } // namespace |
| 92 | 91 |
| 93 // static | 92 // static |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 void SupervisedUserCreationScreen::OnPortalDetectionCompleted( | 156 void SupervisedUserCreationScreen::OnPortalDetectionCompleted( |
| 158 const NetworkState* network, | 157 const NetworkState* network, |
| 159 const NetworkPortalDetector::CaptivePortalState& state) { | 158 const NetworkPortalDetector::CaptivePortalState& state) { |
| 160 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { | 159 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { |
| 161 get_base_screen_delegate()->HideErrorScreen(this); | 160 get_base_screen_delegate()->HideErrorScreen(this); |
| 162 histogram_helper_->OnErrorHide(); | 161 histogram_helper_->OnErrorHide(); |
| 163 } else { | 162 } else { |
| 164 on_error_screen_ = true; | 163 on_error_screen_ = true; |
| 165 ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen(); | 164 ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen(); |
| 166 ConfigureErrorScreen(screen, network, state.status); | 165 ConfigureErrorScreen(screen, network, state.status); |
| 167 screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED); | 166 screen->SetUIState(NetworkError::UI_STATE_SUPERVISED); |
| 168 get_base_screen_delegate()->ShowErrorScreen(); | 167 get_base_screen_delegate()->ShowErrorScreen(); |
| 169 histogram_helper_->OnErrorShow(screen->GetErrorState()); | 168 histogram_helper_->OnErrorShow(screen->error_state()); |
| 170 } | 169 } |
| 171 } | 170 } |
| 172 | 171 |
| 173 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { | 172 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { |
| 174 manager_signin_in_progress_ = false; | 173 manager_signin_in_progress_ = false; |
| 175 if (!actor_) | 174 if (!actor_) |
| 176 return; | 175 return; |
| 177 actor_->ShowErrorPage( | 176 actor_->ShowErrorPage( |
| 178 l10n_util::GetStringUTF16( | 177 l10n_util::GetStringUTF16( |
| 179 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), | 178 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 630 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 629 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 631 } else { | 630 } else { |
| 632 NOTREACHED() << "Unexpected image type: " << image_type; | 631 NOTREACHED() << "Unexpected image type: " << image_type; |
| 633 } | 632 } |
| 634 } | 633 } |
| 635 | 634 |
| 636 void SupervisedUserCreationScreen::OnImageAccepted() { | 635 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 637 } | 636 } |
| 638 | 637 |
| 639 } // namespace chromeos | 638 } // namespace chromeos |
| OLD | NEW |