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

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: Nits Created 3 years, 11 months 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/wallpaper/wallpaper_controller.h" 9 #include "ash/common/wallpaper/wallpaper_controller.h"
10 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // static 96 // static
97 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( 97 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
98 ScreenManager* manager) { 98 ScreenManager* manager) {
99 return static_cast<SupervisedUserCreationScreen*>( 99 return static_cast<SupervisedUserCreationScreen*>(
100 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); 100 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName));
101 } 101 }
102 102
103 SupervisedUserCreationScreen::SupervisedUserCreationScreen( 103 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
104 BaseScreenDelegate* base_screen_delegate, 104 BaseScreenDelegate* base_screen_delegate,
105 SupervisedUserCreationScreenHandler* actor) 105 SupervisedUserCreationScreenHandler* actor)
106 : BaseScreen(base_screen_delegate), 106 : BaseScreen(base_screen_delegate,
107 WizardController::kSupervisedUserCreationScreenName),
107 actor_(actor), 108 actor_(actor),
108 on_error_screen_(false), 109 on_error_screen_(false),
109 manager_signin_in_progress_(false), 110 manager_signin_in_progress_(false),
110 last_page_(kNameOfIntroScreen), 111 last_page_(kNameOfIntroScreen),
111 sync_service_(NULL), 112 sync_service_(NULL),
112 apply_photo_after_decoding_(false), 113 apply_photo_after_decoding_(false),
113 selected_image_(0), 114 selected_image_(0),
114 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")), 115 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")),
115 weak_factory_(this) { 116 weak_factory_(this) {
116 DCHECK(actor_); 117 DCHECK(actor_);
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 } 186 }
186 187
187 void SupervisedUserCreationScreen::Hide() { 188 void SupervisedUserCreationScreen::Hide() {
188 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); 189 CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
189 if (actor_) 190 if (actor_)
190 actor_->Hide(); 191 actor_->Hide();
191 if (!on_error_screen_) 192 if (!on_error_screen_)
192 network_portal_detector::GetInstance()->RemoveObserver(this); 193 network_portal_detector::GetInstance()->RemoveObserver(this);
193 } 194 }
194 195
195 std::string SupervisedUserCreationScreen::GetName() const {
196 return WizardController::kSupervisedUserCreationScreenName;
197 }
198
199 void SupervisedUserCreationScreen::AbortFlow() { 196 void SupervisedUserCreationScreen::AbortFlow() {
200 DBusThreadManager::Get() 197 DBusThreadManager::Get()
201 ->GetSessionManagerClient() 198 ->GetSessionManagerClient()
202 ->NotifySupervisedUserCreationFinished(); 199 ->NotifySupervisedUserCreationFinished();
203 controller_->CancelCreation(); 200 controller_->CancelCreation();
204 } 201 }
205 202
206 void SupervisedUserCreationScreen::FinishFlow() { 203 void SupervisedUserCreationScreen::FinishFlow() {
207 DBusThreadManager::Get() 204 DBusThreadManager::Get()
208 ->GetSessionManagerClient() 205 ->GetSessionManagerClient()
(...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 618 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
622 } else { 619 } else {
623 NOTREACHED() << "Unexpected image type: " << image_type; 620 NOTREACHED() << "Unexpected image type: " << image_type;
624 } 621 }
625 } 622 }
626 623
627 void SupervisedUserCreationScreen::OnImageAccepted() { 624 void SupervisedUserCreationScreen::OnImageAccepted() {
628 } 625 }
629 626
630 } // namespace chromeos 627 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698