| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/shelf/wm_shelf.h" | 9 #include "ash/common/shelf/wm_shelf.h" |
| 10 #include "ash/common/wallpaper/wallpaper_controller.h" | 10 #include "ash/common/wallpaper/wallpaper_controller.h" |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 | 121 |
| 122 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { | 122 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { |
| 123 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); | 123 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); |
| 124 if (sync_service_) | 124 if (sync_service_) |
| 125 sync_service_->RemoveObserver(this); | 125 sync_service_->RemoveObserver(this); |
| 126 if (actor_) | 126 if (actor_) |
| 127 actor_->SetDelegate(NULL); | 127 actor_->SetDelegate(NULL); |
| 128 network_portal_detector::GetInstance()->RemoveObserver(this); | 128 network_portal_detector::GetInstance()->RemoveObserver(this); |
| 129 } | 129 } |
| 130 | 130 |
| 131 void SupervisedUserCreationScreen::PrepareToShow() { | |
| 132 if (actor_) | |
| 133 actor_->PrepareToShow(); | |
| 134 } | |
| 135 | |
| 136 void SupervisedUserCreationScreen::Show() { | 131 void SupervisedUserCreationScreen::Show() { |
| 137 CameraPresenceNotifier::GetInstance()->AddObserver(this); | 132 CameraPresenceNotifier::GetInstance()->AddObserver(this); |
| 138 if (actor_) { | 133 if (actor_) { |
| 139 actor_->Show(); | 134 actor_->Show(); |
| 140 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be | 135 // TODO(antrim) : temorary hack (until upcoming hackaton). Should be |
| 141 // removed once we have screens reworked. | 136 // removed once we have screens reworked. |
| 142 if (on_error_screen_) | 137 if (on_error_screen_) |
| 143 actor_->ShowPage(last_page_); | 138 actor_->ShowPage(last_page_); |
| 144 else | 139 else |
| 145 actor_->ShowIntroPage(); | 140 actor_->ShowIntroPage(); |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; | 624 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; |
| 630 } else { | 625 } else { |
| 631 NOTREACHED() << "Unexpected image type: " << image_type; | 626 NOTREACHED() << "Unexpected image type: " << image_type; |
| 632 } | 627 } |
| 633 } | 628 } |
| 634 | 629 |
| 635 void SupervisedUserCreationScreen::OnImageAccepted() { | 630 void SupervisedUserCreationScreen::OnImageAccepted() { |
| 636 } | 631 } |
| 637 | 632 |
| 638 } // namespace chromeos | 633 } // namespace chromeos |
| OLD | NEW |