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

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

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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_SCRE EN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_SCRE EN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "chrome/browser/chromeos/camera_presence_notifier.h" 12 #include "chrome/browser/chromeos/camera_presence_notifier.h"
13 #include "chrome/browser/chromeos/login/managed/managed_user_creation_controller .h"
14 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" 13 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
14 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.h"
15 #include "chrome/browser/image_decoder.h" 15 #include "chrome/browser/image_decoder.h"
16 #include "chrome/browser/supervised_user/supervised_user_sync_service.h" 16 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
17 #include "chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_s creen_handler.h" 17 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _handler.h"
18 #include "chromeos/network/portal_detector/network_portal_detector.h" 18 #include "chromeos/network/portal_detector/network_portal_detector.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 20
21 class Profile; 21 class Profile;
22 22
23 namespace chromeos { 23 namespace chromeos {
24 24
25 class NetworkState; 25 class NetworkState;
26 26
27 // Class that controls screen showing ui for locally managed user creation. 27 // Class that controls screen showing ui for supervised user creation.
28 class LocallyManagedUserCreationScreen 28 class SupervisedUserCreationScreen
29 : public WizardScreen, 29 : public WizardScreen,
30 public LocallyManagedUserCreationScreenHandler::Delegate, 30 public SupervisedUserCreationScreenHandler::Delegate,
31 public ManagedUserCreationController::StatusConsumer, 31 public SupervisedUserCreationController::StatusConsumer,
32 public SupervisedUserSyncServiceObserver, 32 public SupervisedUserSyncServiceObserver,
33 public ImageDecoder::Delegate, 33 public ImageDecoder::Delegate,
34 public NetworkPortalDetector::Observer, 34 public NetworkPortalDetector::Observer,
35 public CameraPresenceNotifier::Observer { 35 public CameraPresenceNotifier::Observer {
36 public: 36 public:
37 LocallyManagedUserCreationScreen( 37 SupervisedUserCreationScreen(
38 ScreenObserver* observer, 38 ScreenObserver* observer,
39 LocallyManagedUserCreationScreenHandler* actor); 39 SupervisedUserCreationScreenHandler* actor);
40 virtual ~LocallyManagedUserCreationScreen(); 40 virtual ~SupervisedUserCreationScreen();
41 41
42 // Makes screen to show message about inconsistency in manager login flow 42 // Makes screen to show message about inconsistency in manager login flow
43 // (e.g. password change detected, invalid OAuth token, etc). 43 // (e.g. password change detected, invalid OAuth token, etc).
44 // Called when manager user is successfully authenticated, so ui elements 44 // Called when manager user is successfully authenticated, so ui elements
45 // should result in forced logout. 45 // should result in forced logout.
46 void ShowManagerInconsistentStateErrorScreen(); 46 void ShowManagerInconsistentStateErrorScreen();
47 47
48 // Called when authentication fails for manager with provided password. 48 // Called when authentication fails for manager with provided password.
49 // Displays wrong password message on manager selection screen. 49 // Displays wrong password message on manager selection screen.
50 void OnManagerLoginFailure(); 50 void OnManagerLoginFailure();
(...skipping 19 matching lines...) Expand all
70 const std::string& supervised_user_id) OVERRIDE {} 70 const std::string& supervised_user_id) OVERRIDE {}
71 virtual void OnSupervisedUsersSyncingStopped() OVERRIDE {} 71 virtual void OnSupervisedUsersSyncingStopped() OVERRIDE {}
72 virtual void OnSupervisedUsersChanged() OVERRIDE; 72 virtual void OnSupervisedUsersChanged() OVERRIDE;
73 73
74 // WizardScreen implementation: 74 // WizardScreen implementation:
75 virtual void PrepareToShow() OVERRIDE; 75 virtual void PrepareToShow() OVERRIDE;
76 virtual void Show() OVERRIDE; 76 virtual void Show() OVERRIDE;
77 virtual void Hide() OVERRIDE; 77 virtual void Hide() OVERRIDE;
78 virtual std::string GetName() const OVERRIDE; 78 virtual std::string GetName() const OVERRIDE;
79 79
80 // LocallyManagedUserCreationScreenHandler::Delegate implementation: 80 // SupervisedUserCreationScreenHandler::Delegate implementation:
81 virtual void OnActorDestroyed(LocallyManagedUserCreationScreenHandler* actor) 81 virtual void OnActorDestroyed(SupervisedUserCreationScreenHandler* actor)
82 OVERRIDE; 82 OVERRIDE;
83 virtual void CreateManagedUser( 83 virtual void CreateSupervisedUser(
84 const base::string16& display_name, 84 const base::string16& display_name,
85 const std::string& managed_user_password) OVERRIDE; 85 const std::string& supervised_user_password) OVERRIDE;
86 virtual void ImportManagedUser(const std::string& user_id) OVERRIDE; 86 virtual void ImportSupervisedUser(const std::string& user_id) OVERRIDE;
87 virtual void ImportManagedUserWithPassword( 87 virtual void ImportSupervisedUserWithPassword(
88 const std::string& user_id, 88 const std::string& user_id,
89 const std::string& password) OVERRIDE; 89 const std::string& password) OVERRIDE;
90 virtual void AuthenticateManager( 90 virtual void AuthenticateManager(
91 const std::string& manager_id, 91 const std::string& manager_id,
92 const std::string& manager_password) OVERRIDE; 92 const std::string& manager_password) OVERRIDE;
93 virtual void AbortFlow() OVERRIDE; 93 virtual void AbortFlow() OVERRIDE;
94 virtual void FinishFlow() OVERRIDE; 94 virtual void FinishFlow() OVERRIDE;
95 virtual bool FindUserByDisplayName(const base::string16& display_name, 95 virtual bool FindUserByDisplayName(const base::string16& display_name,
96 std::string *out_id) const OVERRIDE; 96 std::string *out_id) const OVERRIDE;
97 virtual void OnPageSelected(const std::string& page) OVERRIDE; 97 virtual void OnPageSelected(const std::string& page) OVERRIDE;
98 98
99 // LocallyManagedUserController::StatusConsumer overrides. 99 // SupervisedUserController::StatusConsumer overrides.
100 virtual void OnCreationError(ManagedUserCreationController::ErrorCode code) 100 virtual void OnCreationError(SupervisedUserCreationController::ErrorCode code)
101 OVERRIDE; 101 OVERRIDE;
102 virtual void OnCreationTimeout() OVERRIDE; 102 virtual void OnCreationTimeout() OVERRIDE;
103 virtual void OnCreationSuccess() OVERRIDE; 103 virtual void OnCreationSuccess() OVERRIDE;
104 virtual void OnLongCreationWarning() OVERRIDE; 104 virtual void OnLongCreationWarning() OVERRIDE;
105 105
106 // NetworkPortalDetector::Observer implementation: 106 // NetworkPortalDetector::Observer implementation:
107 virtual void OnPortalDetectionCompleted( 107 virtual void OnPortalDetectionCompleted(
108 const NetworkState* network, 108 const NetworkState* network,
109 const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE; 109 const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;
110 110
111 // TODO(antrim) : this is an explicit code duplications with UserImageScreen. 111 // TODO(antrim) : this is an explicit code duplications with UserImageScreen.
112 // It should be removed by issue 251179. 112 // It should be removed by issue 251179.
113 113
114 // LocallyManagedUserCreationScreenHandler::Delegate (image) implementation: 114 // SupervisedUserCreationScreenHandler::Delegate (image) implementation:
115 virtual void OnPhotoTaken(const std::string& raw_data) OVERRIDE; 115 virtual void OnPhotoTaken(const std::string& raw_data) OVERRIDE;
116 virtual void OnImageSelected(const std::string& image_url, 116 virtual void OnImageSelected(const std::string& image_url,
117 const std::string& image_type) OVERRIDE; 117 const std::string& image_type) OVERRIDE;
118 virtual void OnImageAccepted() OVERRIDE; 118 virtual void OnImageAccepted() OVERRIDE;
119 // ImageDecoder::Delegate overrides: 119 // ImageDecoder::Delegate overrides:
120 virtual void OnImageDecoded(const ImageDecoder* decoder, 120 virtual void OnImageDecoded(const ImageDecoder* decoder,
121 const SkBitmap& decoded_image) OVERRIDE; 121 const SkBitmap& decoded_image) OVERRIDE;
122 virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE; 122 virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
123 123
124 private: 124 private:
125 void ApplyPicture(); 125 void ApplyPicture();
126 void OnGetManagedUsers(const base::DictionaryValue* users); 126 void OnGetSupervisedUsers(const base::DictionaryValue* users);
127 127
128 base::WeakPtrFactory<LocallyManagedUserCreationScreen> weak_factory_; 128 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
129 LocallyManagedUserCreationScreenHandler* actor_; 129 SupervisedUserCreationScreenHandler* actor_;
130 130
131 scoped_ptr<ManagedUserCreationController> controller_; 131 scoped_ptr<SupervisedUserCreationController> controller_;
132 scoped_ptr<base::DictionaryValue> existing_users_; 132 scoped_ptr<base::DictionaryValue> existing_users_;
133 133
134 bool on_error_screen_; 134 bool on_error_screen_;
135 std::string last_page_; 135 std::string last_page_;
136 136
137 SupervisedUserSyncService* sync_service_; 137 SupervisedUserSyncService* sync_service_;
138 138
139 gfx::ImageSkia user_photo_; 139 gfx::ImageSkia user_photo_;
140 scoped_refptr<ImageDecoder> image_decoder_; 140 scoped_refptr<ImageDecoder> image_decoder_;
141 bool apply_photo_after_decoding_; 141 bool apply_photo_after_decoding_;
142 int selected_image_; 142 int selected_image_;
143 143
144 DISALLOW_COPY_AND_ASSIGN(LocallyManagedUserCreationScreen); 144 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
145 }; 145 };
146 146
147 } // namespace chromeos 147 } // namespace chromeos
148 148
149 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_MANAGED_LOCALLY_MANAGED_USER_CREATION_S CREEN_H_ 149 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_
150 150
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698