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

Side by Side Diff: chrome/browser/permissions/permission_manager.h

Issue 1726323002: Have Permission{Manager,Service} use Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Clarify and test Origin.empty_. Created 4 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 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_PERMISSIONS_PERMISSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
6 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_ 6 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/id_map.h" 9 #include "base/id_map.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "components/content_settings/core/browser/content_settings_observer.h" 12 #include "components/content_settings/core/browser/content_settings_observer.h"
13 #include "components/content_settings/core/common/content_settings.h" 13 #include "components/content_settings/core/common/content_settings.h"
14 #include "components/keyed_service/core/keyed_service.h" 14 #include "components/keyed_service/core/keyed_service.h"
15 #include "content/public/browser/permission_manager.h" 15 #include "content/public/browser/permission_manager.h"
16 16
17 class Profile; 17 class Profile;
18 18
19 namespace content { 19 namespace content {
20 enum class PermissionType; 20 enum class PermissionType;
21 class WebContents; 21 class WebContents;
22 }; // namespace content 22 } // namespace content
23
24 namespace url {
25 class Origin;
26 } // namespace url
23 27
24 class PermissionManager : public KeyedService, 28 class PermissionManager : public KeyedService,
25 public content::PermissionManager, 29 public content::PermissionManager,
26 public content_settings::Observer { 30 public content_settings::Observer {
27 public: 31 public:
28 explicit PermissionManager(Profile* profile); 32 explicit PermissionManager(Profile* profile);
29 ~PermissionManager() override; 33 ~PermissionManager() override;
30 34
31 // content::PermissionManager implementation. 35 // content::PermissionManager implementation.
32 int RequestPermission( 36 int RequestPermission(
33 content::PermissionType permission, 37 content::PermissionType permission,
34 content::RenderFrameHost* render_frame_host, 38 content::RenderFrameHost* render_frame_host,
35 const GURL& requesting_origin, 39 const url::Origin& requesting_origin,
36 const base::Callback<void(content::PermissionStatus)>& callback) override; 40 const base::Callback<void(content::PermissionStatus)>& callback) override;
37 int RequestPermissions( 41 int RequestPermissions(
38 const std::vector<content::PermissionType>& permissions, 42 const std::vector<content::PermissionType>& permissions,
39 content::RenderFrameHost* render_frame_host, 43 content::RenderFrameHost* render_frame_host,
40 const GURL& requesting_origin, 44 const url::Origin& requesting_origin,
41 const base::Callback<void( 45 const base::Callback<void(const std::vector<content::PermissionStatus>&)>&
42 const std::vector<content::PermissionStatus>&)>& callback) override; 46 callback) override;
43 void CancelPermissionRequest(int request_id) override; 47 void CancelPermissionRequest(int request_id) override;
44 void ResetPermission(content::PermissionType permission, 48 void ResetPermission(content::PermissionType permission,
45 const GURL& requesting_origin, 49 const url::Origin& requesting_origin,
46 const GURL& embedding_origin) override; 50 const url::Origin& embedding_origin) override;
47 content::PermissionStatus GetPermissionStatus( 51 content::PermissionStatus GetPermissionStatus(
48 content::PermissionType permission, 52 content::PermissionType permission,
49 const GURL& requesting_origin, 53 const url::Origin& requesting_origin,
50 const GURL& embedding_origin) override; 54 const url::Origin& embedding_origin) override;
51 void RegisterPermissionUsage(content::PermissionType permission, 55 void RegisterPermissionUsage(content::PermissionType permission,
52 const GURL& requesting_origin, 56 const url::Origin& requesting_origin,
53 const GURL& embedding_origin) override; 57 const url::Origin& embedding_origin) override;
54 int SubscribePermissionStatusChange( 58 int SubscribePermissionStatusChange(
55 content::PermissionType permission, 59 content::PermissionType permission,
56 const GURL& requesting_origin, 60 const url::Origin& requesting_origin,
57 const GURL& embedding_origin, 61 const url::Origin& embedding_origin,
58 const base::Callback<void(content::PermissionStatus)>& callback) override; 62 const base::Callback<void(content::PermissionStatus)>& callback) override;
59 void UnsubscribePermissionStatusChange(int subscription_id) override; 63 void UnsubscribePermissionStatusChange(int subscription_id) override;
60 64
61 private: 65 private:
62 class PendingRequest; 66 class PendingRequest;
63 using PendingRequestsMap = IDMap<PendingRequest, IDMapOwnPointer>; 67 using PendingRequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
64 68
65 struct Subscription; 69 struct Subscription;
66 using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>; 70 using SubscriptionsMap = IDMap<Subscription, IDMapOwnPointer>;
67 71
(...skipping 21 matching lines...) Expand all
89 Profile* profile_; 93 Profile* profile_;
90 PendingRequestsMap pending_requests_; 94 PendingRequestsMap pending_requests_;
91 SubscriptionsMap subscriptions_; 95 SubscriptionsMap subscriptions_;
92 96
93 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_; 97 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
94 98
95 DISALLOW_COPY_AND_ASSIGN(PermissionManager); 99 DISALLOW_COPY_AND_ASSIGN(PermissionManager);
96 }; 100 };
97 101
98 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_ 102 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698