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

Side by Side Diff: chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_impl.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_ IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_ IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_ IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVIDER_ IMPL_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/scoped_vector.h" 11 #include "base/memory/scoped_vector.h"
11 #include "base/observer_list.h" 12 #include "base/observer_list.h"
12 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h" 13 #include "chrome/browser/chromeos/policy/affiliated_invalidation_service_provide r.h"
13 #include "content/public/browser/notification_observer.h" 14 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
15 16
16 namespace invalidation { 17 namespace invalidation {
17 class InvalidationService; 18 class InvalidationService;
18 class TiclInvalidationService; 19 class TiclInvalidationService;
19 } 20 }
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 // consumers. 64 // consumers.
64 void SetInvalidationService( 65 void SetInvalidationService(
65 invalidation::InvalidationService* invalidation_service); 66 invalidation::InvalidationService* invalidation_service);
66 67
67 // Destroy the device-global invalidation service, if any. 68 // Destroy the device-global invalidation service, if any.
68 void DestroyDeviceInvalidationService(); 69 void DestroyDeviceInvalidationService();
69 70
70 content::NotificationRegistrar registrar_; 71 content::NotificationRegistrar registrar_;
71 72
72 // Device-global invalidation service. 73 // Device-global invalidation service.
73 scoped_ptr<invalidation::TiclInvalidationService> 74 std::unique_ptr<invalidation::TiclInvalidationService>
74 device_invalidation_service_; 75 device_invalidation_service_;
75 76
76 // State observer for the device-global invalidation service. 77 // State observer for the device-global invalidation service.
77 scoped_ptr<InvalidationServiceObserver> device_invalidation_service_observer_; 78 std::unique_ptr<InvalidationServiceObserver>
79 device_invalidation_service_observer_;
78 80
79 // State observers for logged-in users' invalidation services. 81 // State observers for logged-in users' invalidation services.
80 ScopedVector<InvalidationServiceObserver> 82 ScopedVector<InvalidationServiceObserver>
81 profile_invalidation_service_observers_; 83 profile_invalidation_service_observers_;
82 84
83 // The invalidation service currently used by consumers. nullptr if there are 85 // The invalidation service currently used by consumers. nullptr if there are
84 // no registered consumers or no connected invalidation service is available 86 // no registered consumers or no connected invalidation service is available
85 // for use. 87 // for use.
86 invalidation::InvalidationService* invalidation_service_; 88 invalidation::InvalidationService* invalidation_service_;
87 89
88 base::ObserverList<Consumer, true> consumers_; 90 base::ObserverList<Consumer, true> consumers_;
89 int consumer_count_; 91 int consumer_count_;
90 92
91 bool is_shut_down_; 93 bool is_shut_down_;
92 94
93 DISALLOW_COPY_AND_ASSIGN(AffiliatedInvalidationServiceProviderImpl); 95 DISALLOW_COPY_AND_ASSIGN(AffiliatedInvalidationServiceProviderImpl);
94 }; 96 };
95 97
96 } // namespace policy 98 } // namespace policy
97 99
98 #endif // CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVID ER_IMPL_H_ 100 #endif // CHROME_BROWSER_CHROMEOS_POLICY_AFFILIATED_INVALIDATION_SERVICE_PROVID ER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698