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

Side by Side Diff: components/web_resource/resource_request_allowed_notifier.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_ 5 #ifndef COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_
6 #define COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_ 6 #define COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_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 "components/web_resource/eula_accepted_notifier.h" 11 #include "components/web_resource/eula_accepted_notifier.h"
11 #include "net/base/network_change_notifier.h" 12 #include "net/base/network_change_notifier.h"
12 13
13 class PrefService; 14 class PrefService;
14 15
15 namespace web_resource { 16 namespace web_resource {
16 17
17 // This class informs an interested observer when resource requests over the 18 // This class informs an interested observer when resource requests over the
18 // network are permitted. 19 // network are permitted.
19 // 20 //
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // class should not notify it even if the criteria is met. 111 // class should not notify it even if the criteria is met.
111 bool observer_requested_permission_; 112 bool observer_requested_permission_;
112 113
113 // Tracks network connectivity criteria. 114 // Tracks network connectivity criteria.
114 bool waiting_for_network_; 115 bool waiting_for_network_;
115 116
116 // Tracks EULA acceptance criteria. 117 // Tracks EULA acceptance criteria.
117 bool waiting_for_user_to_accept_eula_; 118 bool waiting_for_user_to_accept_eula_;
118 119
119 // Platform-specific notifier of EULA acceptance, or null if not needed. 120 // Platform-specific notifier of EULA acceptance, or null if not needed.
120 scoped_ptr<EulaAcceptedNotifier> eula_notifier_; 121 std::unique_ptr<EulaAcceptedNotifier> eula_notifier_;
121 122
122 // Observing service interested in request permissions. 123 // Observing service interested in request permissions.
123 Observer* observer_; 124 Observer* observer_;
124 125
125 DISALLOW_COPY_AND_ASSIGN(ResourceRequestAllowedNotifier); 126 DISALLOW_COPY_AND_ASSIGN(ResourceRequestAllowedNotifier);
126 }; 127 };
127 128
128 } // namespace web_resource 129 } // namespace web_resource
129 130
130 #endif // COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_ 131 #endif // COMPONENTS_WEB_RESOURCE_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698