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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.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 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_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 std::string test_pass_; 228 std::string test_pass_;
229 bool test_expects_complete_login_ = false; 229 bool test_expects_complete_login_ = false;
230 230
231 // True if Easy bootstrap is enabled. 231 // True if Easy bootstrap is enabled.
232 bool use_easy_bootstrap_ = false; 232 bool use_easy_bootstrap_ = false;
233 233
234 // True if proxy doesn't allow access to google.com/generate_204. 234 // True if proxy doesn't allow access to google.com/generate_204.
235 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ = 235 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ =
236 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; 236 NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
237 237
238 scoped_ptr<NetworkPortalDetector> network_portal_detector_; 238 std::unique_ptr<NetworkPortalDetector> network_portal_detector_;
239 bool disable_restrictive_proxy_check_for_test_ = false; 239 bool disable_restrictive_proxy_check_for_test_ = false;
240 240
241 // Non-owning ptr to SigninScreenHandler instance. Should not be used 241 // Non-owning ptr to SigninScreenHandler instance. Should not be used
242 // in dtor. 242 // in dtor.
243 // TODO (antrim@): GaiaScreenHandler shouldn't communicate with 243 // TODO (antrim@): GaiaScreenHandler shouldn't communicate with
244 // signin_screen_handler directly. 244 // signin_screen_handler directly.
245 SigninScreenHandler* signin_screen_handler_ = nullptr; 245 SigninScreenHandler* signin_screen_handler_ = nullptr;
246 246
247 // True if offline GAIA is active. 247 // True if offline GAIA is active.
248 bool offline_login_is_active_ = false; 248 bool offline_login_is_active_ = false;
249 249
250 // True if the authentication extension is still loading. 250 // True if the authentication extension is still loading.
251 bool auth_extension_being_loaded_ = false; 251 bool auth_extension_being_loaded_ = false;
252 252
253 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_; 253 base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
254 254
255 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler); 255 DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);
256 }; 256 };
257 257
258 } // namespace chromeos 258 } // namespace chromeos
259 259
260 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_ 260 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698