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

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

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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 "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"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // static 90 // static
91 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( 91 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
92 ScreenManager* manager) { 92 ScreenManager* manager) {
93 return static_cast<SupervisedUserCreationScreen*>( 93 return static_cast<SupervisedUserCreationScreen*>(
94 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); 94 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName));
95 } 95 }
96 96
97 SupervisedUserCreationScreen::SupervisedUserCreationScreen( 97 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
98 ScreenObserver* observer, 98 ScreenObserver* observer,
99 SupervisedUserCreationScreenHandler* actor) 99 SupervisedUserCreationScreenHandler* actor)
100 : WizardScreen(observer), 100 : BaseScreen(observer),
101 actor_(actor), 101 actor_(actor),
102 on_error_screen_(false), 102 on_error_screen_(false),
103 manager_signin_in_progress_(false), 103 manager_signin_in_progress_(false),
104 last_page_(kNameOfIntroScreen), 104 last_page_(kNameOfIntroScreen),
105 sync_service_(NULL), 105 sync_service_(NULL),
106 image_decoder_(NULL), 106 image_decoder_(NULL),
107 apply_photo_after_decoding_(false), 107 apply_photo_after_decoding_(false),
108 selected_image_(0), 108 selected_image_(0),
109 weak_factory_(this) { 109 weak_factory_(this) {
110 DCHECK(actor_); 110 DCHECK(actor_);
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 614 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
615 } else { 615 } else {
616 NOTREACHED() << "Unexpected image type: " << image_type; 616 NOTREACHED() << "Unexpected image type: " << image_type;
617 } 617 }
618 } 618 }
619 619
620 void SupervisedUserCreationScreen::OnImageAccepted() { 620 void SupervisedUserCreationScreen::OnImageAccepted() {
621 } 621 }
622 622
623 } // namespace chromeos 623 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698