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

Side by Side Diff: chrome/browser/chromeos/policy/consumer_enrollment_handler.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_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "components/keyed_service/core/keyed_service.h" 13 #include "components/keyed_service/core/keyed_service.h"
14 #include "google_apis/gaia/oauth2_token_service.h" 14 #include "google_apis/gaia/oauth2_token_service.h"
15 15
16 class Profile; 16 class Profile;
17 17
18 namespace policy { 18 namespace policy {
19 19
20 class ConsumerManagementService; 20 class ConsumerManagementService;
21 class ConsumerManagementStage; 21 class ConsumerManagementStage;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 void OnEnrollmentCompleted(EnrollmentStatus status); 68 void OnEnrollmentCompleted(EnrollmentStatus status);
69 69
70 // Ends the enrollment process. 70 // Ends the enrollment process.
71 void EndEnrollment(const ConsumerManagementStage& stage); 71 void EndEnrollment(const ConsumerManagementStage& stage);
72 72
73 Profile* profile_; 73 Profile* profile_;
74 ConsumerManagementService* consumer_management_service_; 74 ConsumerManagementService* consumer_management_service_;
75 DeviceManagementService* device_management_service_; 75 DeviceManagementService* device_management_service_;
76 std::string gaia_account_id_; 76 std::string gaia_account_id_;
77 77
78 scoped_ptr<OAuth2TokenService::Request> token_request_; 78 std::unique_ptr<OAuth2TokenService::Request> token_request_;
79 base::WeakPtrFactory<ConsumerEnrollmentHandler> weak_ptr_factory_; 79 base::WeakPtrFactory<ConsumerEnrollmentHandler> weak_ptr_factory_;
80 80
81 DISALLOW_COPY_AND_ASSIGN(ConsumerEnrollmentHandler); 81 DISALLOW_COPY_AND_ASSIGN(ConsumerEnrollmentHandler);
82 }; 82 };
83 83
84 } // namespace policy 84 } // namespace policy
85 85
86 #endif // CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_ 86 #endif // CHROME_BROWSER_CHROMEOS_POLICY_CONSUMER_ENROLLMENT_HANDLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698