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

Side by Side Diff: chrome/browser/chromeos/login/enrollment/enrollment_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ENROLLMENT_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/callback_forward.h" 11 #include "base/callback_forward.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h" 16 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
17 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper. h" 17 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper. h"
18 #include "chrome/browser/chromeos/login/screens/base_screen.h" 18 #include "chrome/browser/chromeos/login/screens/base_screen.h"
19 #include "chrome/browser/chromeos/policy/enrollment_config.h" 19 #include "chrome/browser/chromeos/policy/enrollment_config.h"
20 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 20 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
21 #include "components/policy/core/common/cloud/enterprise_metrics.h" 21 #include "components/policy/core/common/cloud/enterprise_metrics.h"
22 22
23 namespace base { 23 namespace base {
24 class ElapsedTimer; 24 class ElapsedTimer;
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 void ShowAttributePromptScreen(); 120 void ShowAttributePromptScreen();
121 121
122 void OnAnyEnrollmentError(); 122 void OnAnyEnrollmentError();
123 123
124 pairing_chromeos::ControllerPairingController* shark_controller_; 124 pairing_chromeos::ControllerPairingController* shark_controller_;
125 125
126 EnrollmentScreenActor* actor_; 126 EnrollmentScreenActor* actor_;
127 policy::EnrollmentConfig enrollment_config_; 127 policy::EnrollmentConfig enrollment_config_;
128 bool enrollment_failed_once_; 128 bool enrollment_failed_once_;
129 std::string enrolling_user_domain_; 129 std::string enrolling_user_domain_;
130 scoped_ptr<base::ElapsedTimer> elapsed_timer_; 130 std::unique_ptr<base::ElapsedTimer> elapsed_timer_;
131 scoped_ptr<EnterpriseEnrollmentHelper> enrollment_helper_; 131 std::unique_ptr<EnterpriseEnrollmentHelper> enrollment_helper_;
132 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_; 132 base::WeakPtrFactory<EnrollmentScreen> weak_ptr_factory_;
133 133
134 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen); 134 DISALLOW_COPY_AND_ASSIGN(EnrollmentScreen);
135 }; 135 };
136 136
137 } // namespace chromeos 137 } // namespace chromeos
138 138
139 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_ 139 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_ENROLLMENT_ENROLLMENT_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698