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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 2549373005: cros: Refactor of BaseScreen::GetName to BaseScreen::screen_id. (Closed)
Patch Set: Remove unneeded mock method Created 4 years 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 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 // static 97 // static
98 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( 98 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
99 ScreenManager* manager) { 99 ScreenManager* manager) {
100 return static_cast<SupervisedUserCreationScreen*>( 100 return static_cast<SupervisedUserCreationScreen*>(
101 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); 101 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName));
102 } 102 }
103 103
104 SupervisedUserCreationScreen::SupervisedUserCreationScreen( 104 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
105 BaseScreenDelegate* base_screen_delegate, 105 BaseScreenDelegate* base_screen_delegate,
106 SupervisedUserCreationScreenHandler* actor) 106 SupervisedUserCreationScreenHandler* actor)
107 : BaseScreen(base_screen_delegate), 107 : BaseScreen(base_screen_delegate,
108 WizardController::kSupervisedUserCreationScreenName),
108 actor_(actor), 109 actor_(actor),
109 on_error_screen_(false), 110 on_error_screen_(false),
110 manager_signin_in_progress_(false), 111 manager_signin_in_progress_(false),
111 last_page_(kNameOfIntroScreen), 112 last_page_(kNameOfIntroScreen),
112 sync_service_(NULL), 113 sync_service_(NULL),
113 apply_photo_after_decoding_(false), 114 apply_photo_after_decoding_(false),
114 selected_image_(0), 115 selected_image_(0),
115 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")), 116 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")),
116 weak_factory_(this) { 117 weak_factory_(this) {
117 DCHECK(actor_); 118 DCHECK(actor_);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 } 187 }
187 188
188 void SupervisedUserCreationScreen::Hide() { 189 void SupervisedUserCreationScreen::Hide() {
189 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); 190 CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
190 if (actor_) 191 if (actor_)
191 actor_->Hide(); 192 actor_->Hide();
192 if (!on_error_screen_) 193 if (!on_error_screen_)
193 network_portal_detector::GetInstance()->RemoveObserver(this); 194 network_portal_detector::GetInstance()->RemoveObserver(this);
194 } 195 }
195 196
196 std::string SupervisedUserCreationScreen::GetName() const {
197 return WizardController::kSupervisedUserCreationScreenName;
198 }
199
200 void SupervisedUserCreationScreen::AbortFlow() { 197 void SupervisedUserCreationScreen::AbortFlow() {
201 DBusThreadManager::Get() 198 DBusThreadManager::Get()
202 ->GetSessionManagerClient() 199 ->GetSessionManagerClient()
203 ->NotifySupervisedUserCreationFinished(); 200 ->NotifySupervisedUserCreationFinished();
204 controller_->CancelCreation(); 201 controller_->CancelCreation();
205 } 202 }
206 203
207 void SupervisedUserCreationScreen::FinishFlow() { 204 void SupervisedUserCreationScreen::FinishFlow() {
208 DBusThreadManager::Get() 205 DBusThreadManager::Get()
209 ->GetSessionManagerClient() 206 ->GetSessionManagerClient()
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 621 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
625 } else { 622 } else {
626 NOTREACHED() << "Unexpected image type: " << image_type; 623 NOTREACHED() << "Unexpected image type: " << image_type;
627 } 624 }
628 } 625 }
629 626
630 void SupervisedUserCreationScreen::OnImageAccepted() { 627 void SupervisedUserCreationScreen::OnImageAccepted() {
631 } 628 }
632 629
633 } // namespace chromeos 630 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698