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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.h

Issue 1865213004: Convert //chrome/browser/ui 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 (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 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h" 17 #include "chrome/browser/chromeos/settings/shutdown_policy_handler.h"
18 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h" 18 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
19 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h" 19 #include "chrome/browser/ui/webui/chromeos/login/oobe_screen.h"
20 #include "content/public/browser/web_ui_controller.h" 20 #include "content/public/browser/web_ui_controller.h"
21 21
22 namespace base { 22 namespace base {
23 class DictionaryValue; 23 class DictionaryValue;
24 } // namespace base 24 } // namespace base
25 25
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 SigninScreenHandler* signin_screen_handler_ = nullptr; 210 SigninScreenHandler* signin_screen_handler_ = nullptr;
211 211
212 TermsOfServiceScreenActor* terms_of_service_screen_actor_ = nullptr; 212 TermsOfServiceScreenActor* terms_of_service_screen_actor_ = nullptr;
213 UserImageView* user_image_view_ = nullptr; 213 UserImageView* user_image_view_ = nullptr;
214 214
215 std::vector<BaseScreenHandler*> handlers_; // Non-owning pointers. 215 std::vector<BaseScreenHandler*> handlers_; // Non-owning pointers.
216 216
217 KioskAppMenuHandler* kiosk_app_menu_handler_ = 217 KioskAppMenuHandler* kiosk_app_menu_handler_ =
218 nullptr; // Non-owning pointers. 218 nullptr; // Non-owning pointers.
219 219
220 scoped_ptr<ErrorScreen> error_screen_; 220 std::unique_ptr<ErrorScreen> error_screen_;
221 221
222 // Id of the current oobe/login screen. 222 // Id of the current oobe/login screen.
223 OobeScreen current_screen_ = OobeScreen::SCREEN_UNKNOWN; 223 OobeScreen current_screen_ = OobeScreen::SCREEN_UNKNOWN;
224 224
225 // Id of the previous oobe/login screen. 225 // Id of the previous oobe/login screen.
226 OobeScreen previous_screen_ = OobeScreen::SCREEN_UNKNOWN; 226 OobeScreen previous_screen_ = OobeScreen::SCREEN_UNKNOWN;
227 227
228 // Flag that indicates whether JS part is fully loaded and ready to accept 228 // Flag that indicates whether JS part is fully loaded and ready to accept
229 // calls. 229 // calls.
230 bool ready_ = false; 230 bool ready_ = false;
231 231
232 // Callbacks to notify when JS part is fully loaded and ready to accept calls. 232 // Callbacks to notify when JS part is fully loaded and ready to accept calls.
233 std::vector<base::Closure> ready_callbacks_; 233 std::vector<base::Closure> ready_callbacks_;
234 234
235 // List of registered observers. 235 // List of registered observers.
236 base::ObserverList<Observer> observer_list_; 236 base::ObserverList<Observer> observer_list_;
237 237
238 // Observer of CrosSettings watching the kRebootOnShutdown policy. 238 // Observer of CrosSettings watching the kRebootOnShutdown policy.
239 scoped_ptr<ShutdownPolicyHandler> shutdown_policy_handler_; 239 std::unique_ptr<ShutdownPolicyHandler> shutdown_policy_handler_;
240 240
241 DISALLOW_COPY_AND_ASSIGN(OobeUI); 241 DISALLOW_COPY_AND_ASSIGN(OobeUI);
242 }; 242 };
243 243
244 } // namespace chromeos 244 } // namespace chromeos
245 245
246 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_ 246 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_state_informer.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698