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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/auto_enrollment_check_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_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
12 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h" 13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_check_screen_ actor.h"
13 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h" 14 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
14 #include "chrome/browser/chromeos/login/screens/base_screen.h" 15 #include "chrome/browser/chromeos/login/screens/base_screen.h"
15 #include "chrome/browser/chromeos/login/screens/error_screen.h" 16 #include "chrome/browser/chromeos/login/screens/error_screen.h"
16 #include "chrome/browser/chromeos/login/screens/network_error.h" 17 #include "chrome/browser/chromeos/login/screens/network_error.h"
17 #include "chromeos/network/portal_detector/network_portal_detector.h" 18 #include "chromeos/network/portal_detector/network_portal_detector.h"
18 19
19 namespace chromeos { 20 namespace chromeos {
20 21
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 88
88 // Returns whether enrollment check was completed and decision was made. 89 // Returns whether enrollment check was completed and decision was made.
89 bool IsCompleted() const; 90 bool IsCompleted() const;
90 91
91 // The user requested a connection attempt to be performed. 92 // The user requested a connection attempt to be performed.
92 void OnConnectRequested(); 93 void OnConnectRequested();
93 94
94 AutoEnrollmentCheckScreenActor* actor_; 95 AutoEnrollmentCheckScreenActor* actor_;
95 AutoEnrollmentController* auto_enrollment_controller_; 96 AutoEnrollmentController* auto_enrollment_controller_;
96 97
97 scoped_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription> 98 std::unique_ptr<AutoEnrollmentController::ProgressCallbackList::Subscription>
98 auto_enrollment_progress_subscription_; 99 auto_enrollment_progress_subscription_;
99 100
100 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_; 101 NetworkPortalDetector::CaptivePortalStatus captive_portal_status_;
101 policy::AutoEnrollmentState auto_enrollment_state_; 102 policy::AutoEnrollmentState auto_enrollment_state_;
102 103
103 scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_; 104 std::unique_ptr<ErrorScreensHistogramHelper> histogram_helper_;
104 105
105 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_; 106 ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;
106 107
107 base::WeakPtrFactory<AutoEnrollmentCheckScreen> weak_ptr_factory_; 108 base::WeakPtrFactory<AutoEnrollmentCheckScreen> weak_ptr_factory_;
108 109
109 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen); 110 DISALLOW_COPY_AND_ASSIGN(AutoEnrollmentCheckScreen);
110 }; 111 };
111 112
112 } // namespace chromeos 113 } // namespace chromeos
113 114
114 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_ 115 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_AUTO_ENROLLMENT_CHECK_SCREEN _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698