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

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

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more Created 3 years, 10 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>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
15 #include "base/gtest_prod_util.h" 15 #include "base/gtest_prod_util.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "chrome/browser/background/background_trigger.h" 18 #include "chrome/browser/background/background_trigger.h"
19 #include "chrome/browser/push_messaging/push_messaging_notification_manager.h" 19 #include "chrome/browser/push_messaging/push_messaging_notification_manager.h"
20 #include "chrome/common/features.h" 20 #include "chrome/common/features.h"
21 #include "components/content_settings/core/browser/content_settings_observer.h" 21 #include "components/content_settings/core/browser/content_settings_observer.h"
22 #include "components/content_settings/core/common/content_settings.h" 22 #include "components/content_settings/core/common/content_settings.h"
23 #include "components/content_settings/core/common/content_settings_types.h"
23 #include "components/gcm_driver/common/gcm_messages.h" 24 #include "components/gcm_driver/common/gcm_messages.h"
24 #include "components/gcm_driver/gcm_app_handler.h" 25 #include "components/gcm_driver/gcm_app_handler.h"
25 #include "components/gcm_driver/gcm_client.h" 26 #include "components/gcm_driver/gcm_client.h"
26 #include "components/gcm_driver/instance_id/instance_id.h" 27 #include "components/gcm_driver/instance_id/instance_id.h"
27 #include "components/keyed_service/core/keyed_service.h" 28 #include "components/keyed_service/core/keyed_service.h"
28 #include "content/public/browser/push_messaging_service.h" 29 #include "content/public/browser/push_messaging_service.h"
29 #include "content/public/common/push_event_payload.h" 30 #include "content/public/common/push_event_payload.h"
30 #include "content/public/common/push_messaging_status.h" 31 #include "content/public/common/push_messaging_status.h"
31 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h" 32 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.h"
32 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermi ssionStatus.h" 33 #include "third_party/WebKit/public/platform/modules/push_messaging/WebPushPermi ssionStatus.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 // we can finish processing them without being interrupted. 271 // we can finish processing them without being interrupted.
271 std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_; 272 std::unique_ptr<ScopedKeepAlive> in_flight_keep_alive_;
272 #endif 273 #endif
273 274
274 base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_; 275 base::WeakPtrFactory<PushMessagingServiceImpl> weak_factory_;
275 276
276 DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl); 277 DISALLOW_COPY_AND_ASSIGN(PushMessagingServiceImpl);
277 }; 278 };
278 279
279 #endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_ 280 #endif // CHROME_BROWSER_PUSH_MESSAGING_PUSH_MESSAGING_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698