| 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/existing_user_controller.h" | 12 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 13 #include "chrome/browser/chromeos/login/screen_manager.h" |
| 13 #include "chrome/browser/chromeos/login/screens/error_screen.h" | 14 #include "chrome/browser/chromeos/login/screens/error_screen.h" |
| 14 #include "chrome/browser/chromeos/login/screens/screen_observer.h" | 15 #include "chrome/browser/chromeos/login/screens/screen_observer.h" |
| 15 #include "chrome/browser/chromeos/login/signin_specifics.h" | 16 #include "chrome/browser/chromeos/login/signin_specifics.h" |
| 16 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" | 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_authenticatio
n.h" |
| 17 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" | 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller.h" |
| 18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" | 19 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont
roller_new.h" |
| 19 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" | 20 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h" |
| 20 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 21 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 21 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 22 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 22 #include "chrome/browser/chromeos/login/wizard_controller.h" | 23 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 std::string()); | 79 std::string()); |
| 79 break; | 80 break; |
| 80 default: | 81 default: |
| 81 NOTREACHED(); | 82 NOTREACHED(); |
| 82 break; | 83 break; |
| 83 } | 84 } |
| 84 } | 85 } |
| 85 | 86 |
| 86 } // namespace | 87 } // namespace |
| 87 | 88 |
| 89 // static |
| 90 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( |
| 91 ScreenManager* manager) { |
| 92 return static_cast<SupervisedUserCreationScreen*>( |
| 93 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); |
| 94 } |
| 95 |
| 88 SupervisedUserCreationScreen::SupervisedUserCreationScreen( | 96 SupervisedUserCreationScreen::SupervisedUserCreationScreen( |
| 89 ScreenObserver* observer, | 97 ScreenObserver* observer, |
| 90 SupervisedUserCreationScreenHandler* actor) | 98 SupervisedUserCreationScreenHandler* actor) |
| 91 : WizardScreen(observer), | 99 : WizardScreen(observer), |
| 92 weak_factory_(this), | 100 weak_factory_(this), |
| 93 actor_(actor), | 101 actor_(actor), |
| 94 on_error_screen_(false), | 102 on_error_screen_(false), |
| 95 last_page_(kNameOfIntroScreen), | 103 last_page_(kNameOfIntroScreen), |
| 96 sync_service_(NULL), | 104 sync_service_(NULL), |
| 97 image_decoder_(NULL), | 105 image_decoder_(NULL), |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 602 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 595 } else { | 603 } else { |
| 596 NOTREACHED() << "Unexpected image type: " << image_type; | 604 NOTREACHED() << "Unexpected image type: " << image_type; |
| 597 } | 605 } |
| 598 } | 606 } |
| 599 | 607 |
| 600 void SupervisedUserCreationScreen::OnImageAccepted() { | 608 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 601 } | 609 } |
| 602 | 610 |
| 603 } // namespace chromeos | 611 } // namespace chromeos |
| OLD | NEW |