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

Side by Side Diff: chrome/browser/push_messaging/push_messaging_service_impl.h

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests Created 3 years, 9 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_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_ 5 #ifndef CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
6 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_ 6 #define CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 content::PushDeliveryStatus status); 139 content::PushDeliveryStatus status);
140 140
141 void DidHandleMessage(const std::string& app_id, 141 void DidHandleMessage(const std::string& app_id,
142 const base::Closure& completion_closure); 142 const base::Closure& completion_closure);
143 143
144 // Subscribe methods --------------------------------------------------------- 144 // Subscribe methods ---------------------------------------------------------
145 145
146 void DoSubscribe(const PushMessagingAppIdentifier& app_identifier, 146 void DoSubscribe(const PushMessagingAppIdentifier& app_identifier,
147 const content::PushSubscriptionOptions& options, 147 const content::PushSubscriptionOptions& options,
148 const RegisterCallback& callback, 148 const RegisterCallback& callback,
149 blink::mojom::PermissionStatus permission_status); 149 ContentSetting permission_status);
150 150
151 void SubscribeEnd(const RegisterCallback& callback, 151 void SubscribeEnd(const RegisterCallback& callback,
152 const std::string& subscription_id, 152 const std::string& subscription_id,
153 const std::vector<uint8_t>& p256dh, 153 const std::vector<uint8_t>& p256dh,
154 const std::vector<uint8_t>& auth, 154 const std::vector<uint8_t>& auth,
155 content::PushRegistrationStatus status); 155 content::PushRegistrationStatus status);
156 156
157 void SubscribeEndWithError(const RegisterCallback& callback, 157 void SubscribeEndWithError(const RegisterCallback& callback,
158 content::PushRegistrationStatus status); 158 content::PushRegistrationStatus status);
159 159
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 // we can finish processing them without being interrupted. 271 // we can finish processing them without being interrupted.
272 std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_; 272 std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_;
273 #endif 273 #endif
274 274
275 base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_; 275 base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
276 276
277 DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl); 277 DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
278 }; 278 };
279 279
280 #endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_ 280 #endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/plugins/flash_download_interception.cc ('k') | chrome/browser/push_messaging/push_messaging_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698