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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_controller.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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_APP_LAUNCH_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 void Observe(int type, 113 void Observe(int type,
114 const content::NotificationSource& source, 114 const content::NotificationSource& source,
115 const content::NotificationDetails& details) override; 115 const content::NotificationDetails& details) override;
116 116
117 Profile* profile_ = nullptr; 117 Profile* profile_ = nullptr;
118 const std::string app_id_; 118 const std::string app_id_;
119 const bool diagnostic_mode_; 119 const bool diagnostic_mode_;
120 LoginDisplayHost* host_ = nullptr; 120 LoginDisplayHost* host_ = nullptr;
121 OobeUI* oobe_ui_ = nullptr; 121 OobeUI* oobe_ui_ = nullptr;
122 AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr; 122 AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr;
123 scoped_ptr<KioskProfileLoader> kiosk_profile_loader_; 123 std::unique_ptr<KioskProfileLoader> kiosk_profile_loader_;
124 scoped_ptr<StartupAppLauncher> startup_app_launcher_; 124 std::unique_ptr<StartupAppLauncher> startup_app_launcher_;
125 scoped_ptr<AppLaunchSigninScreen> signin_screen_; 125 std::unique_ptr<AppLaunchSigninScreen> signin_screen_;
126 scoped_ptr<AppWindowWatcher> app_window_watcher_; 126 std::unique_ptr<AppWindowWatcher> app_window_watcher_;
127 127
128 content::NotificationRegistrar registrar_; 128 content::NotificationRegistrar registrar_;
129 bool webui_visible_ = false; 129 bool webui_visible_ = false;
130 bool launcher_ready_ = false; 130 bool launcher_ready_ = false;
131 131
132 // A timer to ensure the app splash is shown for a minimum amount of time. 132 // A timer to ensure the app splash is shown for a minimum amount of time.
133 base::OneShotTimer splash_wait_timer_; 133 base::OneShotTimer splash_wait_timer_;
134 134
135 base::OneShotTimer network_wait_timer_; 135 base::OneShotTimer network_wait_timer_;
136 bool waiting_for_network_ = false; 136 bool waiting_for_network_ = false;
137 bool network_wait_timedout_ = false; 137 bool network_wait_timedout_ = false;
138 bool showing_network_dialog_ = false; 138 bool showing_network_dialog_ = false;
139 bool network_config_requested_ = false; 139 bool network_config_requested_ = false;
140 int64_t launch_splash_start_time_ = 0; 140 int64_t launch_splash_start_time_ = 0;
141 141
142 static bool skip_splash_wait_; 142 static bool skip_splash_wait_;
143 static int network_wait_time_; 143 static int network_wait_time_;
144 static base::Closure* network_timeout_callback_; 144 static base::Closure* network_timeout_callback_;
145 static ReturnBoolCallback* can_configure_network_callback_; 145 static ReturnBoolCallback* can_configure_network_callback_;
146 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_; 146 static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;
147 147
148 DISALLOW_COPY_AND_ASSIGN(AppLaunchController); 148 DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
149 }; 149 };
150 150
151 } // namespace chromeos 151 } // namespace chromeos
152 152
153 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_ 153 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_APP_LAUNCH_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.h ('k') | chrome/browser/chromeos/login/auth/chrome_login_performer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698