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

Side by Side Diff: chrome/browser/chromeos/login/screens/screen_factory.cc

Issue 393343002: Rename "managed (mode|user)" to "supervised user" (part 7) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more alphabetize (and rebase again) Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/screens/screen_factory.h" 5 #include "chrome/browser/chromeos/login/screens/screen_factory.h"
6 6
7 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 7 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
8 #include "chrome/browser/chromeos/login/managed/locally_managed_user_creation_sc reen.h"
9 #include "chrome/browser/chromeos/login/screens/base_screen.h" 8 #include "chrome/browser/chromeos/login/screens/base_screen.h"
10 #include "chrome/browser/chromeos/login/screens/error_screen.h" 9 #include "chrome/browser/chromeos/login/screens/error_screen.h"
11 #include "chrome/browser/chromeos/login/screens/eula_screen.h" 10 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
12 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h" 11 #include "chrome/browser/chromeos/login/screens/kiosk_autolaunch_screen.h"
13 #include "chrome/browser/chromeos/login/screens/network_screen.h" 12 #include "chrome/browser/chromeos/login/screens/network_screen.h"
14 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 13 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
15 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h" 14 #include "chrome/browser/chromeos/login/screens/terms_of_service_screen.h"
16 #include "chrome/browser/chromeos/login/screens/update_screen.h" 15 #include "chrome/browser/chromeos/login/screens/update_screen.h"
17 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 16 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
18 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h" 17 #include "chrome/browser/chromeos/login/screens/wrong_hwid_screen.h"
18 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 21
22 // static 22 // static
23 const char ScreenFactory::kEnrollmentScreenId[] = "enroll"; 23 const char ScreenFactory::kEnrollmentScreenId[] = "enroll";
24 const char ScreenFactory::kErrorScreenId[] = "error-message"; 24 const char ScreenFactory::kErrorScreenId[] = "error-message";
25 const char ScreenFactory::kEulaScreenId[] = "eula"; 25 const char ScreenFactory::kEulaScreenId[] = "eula";
26 const char ScreenFactory::kKioskAutolaunchScreenId[] = "autolaunch"; 26 const char ScreenFactory::kKioskAutolaunchScreenId[] = "autolaunch";
27 const char ScreenFactory::kLocallyManagedUserCreationScreenId[] =
28 "locally-managed-user-creation-flow";
29 const char ScreenFactory::kNetworkScreenId[] = "network"; 27 const char ScreenFactory::kNetworkScreenId[] = "network";
30 const char ScreenFactory::kResetScreenId[] = "reset"; 28 const char ScreenFactory::kResetScreenId[] = "reset";
29 const char ScreenFactory::kSupervisedUserCreationScreenId[] =
30 "locally-managed-user-creation-flow";
31 const char ScreenFactory::kTermsOfServiceScreenId[] = "tos"; 31 const char ScreenFactory::kTermsOfServiceScreenId[] = "tos";
32 const char ScreenFactory::kUpdateScreenId[] = "update"; 32 const char ScreenFactory::kUpdateScreenId[] = "update";
33 const char ScreenFactory::kUserImageScreenId[] = "image"; 33 const char ScreenFactory::kUserImageScreenId[] = "image";
34 const char ScreenFactory::kWrongHWIDScreenId[] = "wrong-hwid"; 34 const char ScreenFactory::kWrongHWIDScreenId[] = "wrong-hwid";
35 35
36 const char ScreenFactory::kLoginScreenId[] = "login"; 36 const char ScreenFactory::kLoginScreenId[] = "login";
37 37
38 ScreenFactory::ScreenFactory(ScreenObserver* observer, 38 ScreenFactory::ScreenFactory(ScreenObserver* observer,
39 OobeDisplay* oobe_display) 39 OobeDisplay* oobe_display)
40 : observer_(observer), 40 : observer_(observer),
(...skipping 27 matching lines...) Expand all
68 } else if (id == kKioskAutolaunchScreenId) { 68 } else if (id == kKioskAutolaunchScreenId) {
69 return new KioskAutolaunchScreen( 69 return new KioskAutolaunchScreen(
70 observer_, oobe_display_->GetKioskAutolaunchScreenActor()); 70 observer_, oobe_display_->GetKioskAutolaunchScreenActor());
71 } else if (id == kTermsOfServiceScreenId) { 71 } else if (id == kTermsOfServiceScreenId) {
72 return new TermsOfServiceScreen(observer_, 72 return new TermsOfServiceScreen(observer_,
73 oobe_display_->GetTermsOfServiceScreenActor()); 73 oobe_display_->GetTermsOfServiceScreenActor());
74 } else if (id == kWrongHWIDScreenId) { 74 } else if (id == kWrongHWIDScreenId) {
75 return new WrongHWIDScreen( 75 return new WrongHWIDScreen(
76 observer_, 76 observer_,
77 oobe_display_->GetWrongHWIDScreenActor()); 77 oobe_display_->GetWrongHWIDScreenActor());
78 } else if (id == kLocallyManagedUserCreationScreenId) { 78 } else if (id == kSupervisedUserCreationScreenId) {
79 return new LocallyManagedUserCreationScreen( 79 return new SupervisedUserCreationScreen(
80 observer_, 80 observer_,
81 oobe_display_->GetLocallyManagedUserCreationScreenActor()); 81 oobe_display_->GetSupervisedUserCreationScreenActor());
82 } else if (id == kErrorScreenId) { 82 } else if (id == kErrorScreenId) {
83 return new ErrorScreen(observer_, oobe_display_->GetErrorScreenActor()); 83 return new ErrorScreen(observer_, oobe_display_->GetErrorScreenActor());
84 } 84 }
85 85
86 // TODO(antrim): support for login screen. 86 // TODO(antrim): support for login screen.
87 NOTREACHED() << "Unknown screen ID: " << id; 87 NOTREACHED() << "Unknown screen ID: " << id;
88 return NULL; 88 return NULL;
89 } 89 }
90 90
91 } // namespace chromeos 91 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/screen_factory.h ('k') | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698