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

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

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // ImageDecoder::ImageRequest overrides: 120 // ImageDecoder::ImageRequest overrides:
121 void OnImageDecoded(const SkBitmap& decoded_image) override; 121 void OnImageDecoded(const SkBitmap& decoded_image) override;
122 void OnDecodeImageFailed() override; 122 void OnDecodeImageFailed() override;
123 123
124 private: 124 private:
125 void ApplyPicture(); 125 void ApplyPicture();
126 void OnGetSupervisedUsers(const base::DictionaryValue* users); 126 void OnGetSupervisedUsers(const base::DictionaryValue* users);
127 127
128 SupervisedUserCreationScreenHandler* actor_; 128 SupervisedUserCreationScreenHandler* actor_;
129 129
130 scoped_ptr<SupervisedUserCreationController> controller_; 130 std::unique_ptr<SupervisedUserCreationController> controller_;
131 scoped_ptr<base::DictionaryValue> existing_users_; 131 std::unique_ptr<base::DictionaryValue> existing_users_;
132 132
133 bool on_error_screen_; 133 bool on_error_screen_;
134 bool manager_signin_in_progress_; 134 bool manager_signin_in_progress_;
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 bool apply_photo_after_decoding_; 140 bool apply_photo_after_decoding_;
141 int selected_image_; 141 int selected_image_;
142 142
143 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_; 143 std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_;
144 144
145 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_; 145 base::WeakPtrFactory<SupervisedUserCreationScreen> weak_factory_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen); 147 DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationScreen);
148 }; 148 };
149 149
150 } // namespace chromeos 150 } // namespace chromeos
151 151
152 #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_
153 153
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698