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

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

Issue 2856683002: cros: Replace "TPM" with "secure module" for machines without TPM. (Closed)
Patch Set: Suffixed chromeos for chromeos compiling of secure_module_*. Created 3 years, 7 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 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCREEN _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/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/macros.h" 11 #include "base/macros.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/screens/base_screen.h" 13 #include "chrome/browser/chromeos/login/screens/base_screen.h"
14 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_cont roller.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/legacy/supervised_user_sync_service.h" 16 #include "chrome/browser/supervised_user/legacy/supervised_user_sync_service.h"
17 #include "chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen _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 "components/login/secure_module_util_chromeos.h"
19 #include "ui/gfx/image/image_skia.h" 20 #include "ui/gfx/image/image_skia.h"
20 21
21 class Profile; 22 class Profile;
22 23
23 namespace chromeos { 24 namespace chromeos {
24 25
25 class ErrorScreensHistogramHelper; 26 class ErrorScreensHistogramHelper;
26 class NetworkState; 27 class NetworkState;
27 class ScreenManager; 28 class ScreenManager;
28 29
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 void OnImageSelected(const std::string& image_url, 116 void OnImageSelected(const std::string& image_url,
116 const std::string& image_type) override; 117 const std::string& image_type) override;
117 void OnImageAccepted() override; 118 void OnImageAccepted() override;
118 // ImageDecoder::ImageRequest overrides: 119 // ImageDecoder::ImageRequest overrides:
119 void OnImageDecoded(const SkBitmap& decoded_image) override; 120 void OnImageDecoded(const SkBitmap& decoded_image) override;
120 void OnDecodeImageFailed() override; 121 void OnDecodeImageFailed() override;
121 122
122 private: 123 private:
123 void ApplyPicture(); 124 void ApplyPicture();
124 void OnGetSupervisedUsers(const base::DictionaryValue* users); 125 void OnGetSupervisedUsers(const base::DictionaryValue* users);
126 void UpdateSecureModuleMessages(::login::SecureModuleUsed secure_module_used);
125 127
126 SupervisedUserCreationScreenHandler* view_; 128 SupervisedUserCreationScreenHandler* view_;
127 129
128 std::unique_ptr<SupervisedUserCreationController> controller_; 130 std::unique_ptr<SupervisedUserCreationController> controller_;
129 std::unique_ptr<base::DictionaryValue> existing_users_; 131 std::unique_ptr<base::DictionaryValue> existing_users_;
130 132
131 bool on_error_screen_; 133 bool on_error_screen_;
132 bool manager_signin_in_progress_; 134 bool manager_signin_in_progress_;
133 std::string last_page_; 135 std::string last_page_;
134 136
135 SupervisedUserSyncService* sync_service_; 137 SupervisedUserSyncService* sync_service_;
136 138
137 gfx::ImageSkia user_photo_; 139 gfx::ImageSkia user_photo_;
138 bool apply_photo_after_decoding_; 140 bool apply_photo_after_decoding_;
139 int selected_image_; 141 int selected_image_;
140 142
141 std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_; 143 std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_;
142 144
143 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_; 145 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
144 146
145 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen); 147 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
146 }; 148 };
147 149
148 } // namespace chromeos 150 } // namespace chromeos
149 151
150 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_ 152 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SUPERVISED_SUPERVISED_USER_CREATION_SCR EEN_H_
151 153
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698