| 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/existing_user_controller.h" | 13 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 13 #include "chrome/browser/chromeos/login/screen_manager.h" | 14 #include "chrome/browser/chromeos/login/screen_manager.h" |
| 14 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 15 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 15 #include "chrome/browser/chromeos/login/screens/screen_observer.h" | 16 #include "chrome/browser/chromeos/login/screens/screen_observer.h" |
| 16 #include "chrome/browser/chromeos/login/signin_specifics.h" | 17 #include "chrome/browser/chromeos/login/signin_specifics.h" |
| 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" | 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" |
| 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" | 20 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" |
| 20 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 21 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 21 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 22 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 ScreenObserver* observer, | 98 ScreenObserver* observer, |
| 98 SupervisedUserCreationScreenHandler* actor) | 99 SupervisedUserCreationScreenHandler* actor) |
| 99 : WizardScreen(observer), | 100 : WizardScreen(observer), |
| 100 weak_factory_(this), | 101 weak_factory_(this), |
| 101 actor_(actor), | 102 actor_(actor), |
| 102 on_error_screen_(false), | 103 on_error_screen_(false), |
| 103 last_page_(kNameOfIntroScreen), | 104 last_page_(kNameOfIntroScreen), |
| 104 sync_service_(NULL), | 105 sync_service_(NULL), |
| 105 image_decoder_(NULL), | 106 image_decoder_(NULL), |
| 106 apply_photo_after_decoding_(false), | 107 apply_photo_after_decoding_(false), |
| 107 selected_image_(0) { | 108 selected_image_(0), |
| 109 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")) { |
| 108 DCHECK(actor_); | 110 DCHECK(actor_); |
| 109 if (actor_) | 111 if (actor_) |
| 110 actor_->SetDelegate(this); | 112 actor_->SetDelegate(this); |
| 111 } | 113 } |
| 112 | 114 |
| 113 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { | 115 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { |
| 114 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); | 116 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); |
| 115 if (sync_service_) | 117 if (sync_service_) |
| 116 sync_service_->RemoveObserver(this); | 118 sync_service_->RemoveObserver(this); |
| 117 if (actor_) | 119 if (actor_) |
| (...skipping 16 matching lines...) Expand all Loading... |
| 134 // removed once we have screens reworked. | 136 // removed once we have screens reworked. |
| 135 if (on_error_screen_) | 137 if (on_error_screen_) |
| 136 actor_->ShowPage(last_page_); | 138 actor_->ShowPage(last_page_); |
| 137 else | 139 else |
| 138 actor_->ShowIntroPage(); | 140 actor_->ShowIntroPage(); |
| 139 } | 141 } |
| 140 | 142 |
| 141 if (!on_error_screen_) | 143 if (!on_error_screen_) |
| 142 NetworkPortalDetector::Get()->AddAndFireObserver(this); | 144 NetworkPortalDetector::Get()->AddAndFireObserver(this); |
| 143 on_error_screen_ = false; | 145 on_error_screen_ = false; |
| 146 histogram_helper_->OnScreenShow(); |
| 144 } | 147 } |
| 145 | 148 |
| 146 void SupervisedUserCreationScreen::OnPageSelected(const std::string& page) { | 149 void SupervisedUserCreationScreen::OnPageSelected(const std::string& page) { |
| 147 last_page_ = page; | 150 last_page_ = page; |
| 148 } | 151 } |
| 149 | 152 |
| 150 void SupervisedUserCreationScreen::OnPortalDetectionCompleted( | 153 void SupervisedUserCreationScreen::OnPortalDetectionCompleted( |
| 151 const NetworkState* network, | 154 const NetworkState* network, |
| 152 const NetworkPortalDetector::CaptivePortalState& state) { | 155 const NetworkPortalDetector::CaptivePortalState& state) { |
| 153 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { | 156 if (state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE) { |
| 154 get_screen_observer()->HideErrorScreen(this); | 157 get_screen_observer()->HideErrorScreen(this); |
| 158 histogram_helper_->OnErrorHide(); |
| 155 } else { | 159 } else { |
| 156 on_error_screen_ = true; | 160 on_error_screen_ = true; |
| 157 ErrorScreen* screen = get_screen_observer()->GetErrorScreen(); | 161 ErrorScreen* screen = get_screen_observer()->GetErrorScreen(); |
| 158 ConfigureErrorScreen(screen, network, state.status); | 162 ConfigureErrorScreen(screen, network, state.status); |
| 159 screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED); | 163 screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED); |
| 160 get_screen_observer()->ShowErrorScreen(); | 164 get_screen_observer()->ShowErrorScreen(); |
| 165 histogram_helper_->OnErrorShow(screen->GetErrorState()); |
| 161 } | 166 } |
| 162 } | 167 } |
| 163 | 168 |
| 164 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { | 169 void SupervisedUserCreationScreen::ShowManagerInconsistentStateErrorScreen() { |
| 165 if (!actor_) | 170 if (!actor_) |
| 166 return; | 171 return; |
| 167 actor_->ShowErrorPage( | 172 actor_->ShowErrorPage( |
| 168 l10n_util::GetStringUTF16( | 173 l10n_util::GetStringUTF16( |
| 169 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), | 174 IDS_CREATE_SUPERVISED_USER_MANAGER_INCONSISTENT_STATE_TITLE), |
| 170 l10n_util::GetStringUTF16( | 175 l10n_util::GetStringUTF16( |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 607 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 603 } else { | 608 } else { |
| 604 NOTREACHED() << "Unexpected image type: " << image_type; | 609 NOTREACHED() << "Unexpected image type: " << image_type; |
| 605 } | 610 } |
| 606 } | 611 } |
| 607 | 612 |
| 608 void SupervisedUserCreationScreen::OnImageAccepted() { | 613 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 609 } | 614 } |
| 610 | 615 |
| 611 } // namespace chromeos | 616 } // namespace chromeos |
| OLD | NEW |