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

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

Issue 2446863002: Revert of Add threadsafe version of PermissionManager::GetPermissionStatus (Closed)
Patch Set: Created 4 years, 1 month 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 <unordered_map> 8 #include <unordered_map>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
11 #include "base/id_map.h" 11 #include "base/id_map.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "chrome/browser/permissions/permission_util.h" 14 #include "chrome/browser/permissions/permission_util.h"
15 #include "components/content_settings/core/browser/content_settings_observer.h" 15 #include "components/content_settings/core/browser/content_settings_observer.h"
16 #include "components/content_settings/core/common/content_settings.h" 16 #include "components/content_settings/core/common/content_settings.h"
17 #include "components/keyed_service/core/keyed_service.h" 17 #include "components/keyed_service/core/keyed_service.h"
18 #include "content/public/browser/permission_manager.h" 18 #include "content/public/browser/permission_manager.h"
19 19
20 class HostContentSettingsMap;
21 class PermissionContextBase; 20 class PermissionContextBase;
22 class Profile; 21 class Profile;
23 22
24 namespace content { 23 namespace content {
25 enum class PermissionType; 24 enum class PermissionType;
26 class WebContents; 25 class WebContents;
27 }; // namespace content 26 }; // namespace content
28 27
29 class PermissionManager : public KeyedService, 28 class PermissionManager : public KeyedService,
30 public content::PermissionManager, 29 public content::PermissionManager,
(...skipping 21 matching lines...) Expand all
52 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) 51 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
53 override; 52 override;
54 void CancelPermissionRequest(int request_id) override; 53 void CancelPermissionRequest(int request_id) override;
55 void ResetPermission(content::PermissionType permission, 54 void ResetPermission(content::PermissionType permission,
56 const GURL& requesting_origin, 55 const GURL& requesting_origin,
57 const GURL& embedding_origin) override; 56 const GURL& embedding_origin) override;
58 blink::mojom::PermissionStatus GetPermissionStatus( 57 blink::mojom::PermissionStatus GetPermissionStatus(
59 content::PermissionType permission, 58 content::PermissionType permission,
60 const GURL& requesting_origin, 59 const GURL& requesting_origin,
61 const GURL& embedding_origin) override; 60 const GURL& embedding_origin) override;
62
63 blink::mojom::PermissionStatus GetPermissionStatus(
64 HostContentSettingsMap* host,
65 content::PermissionType permission,
66 const GURL& requesting_origin,
67 const GURL& embedding_origin);
68
69 void RegisterPermissionUsage(content::PermissionType permission, 61 void RegisterPermissionUsage(content::PermissionType permission,
70 const GURL& requesting_origin, 62 const GURL& requesting_origin,
71 const GURL& embedding_origin) override; 63 const GURL& embedding_origin) override;
72 int SubscribePermissionStatusChange( 64 int SubscribePermissionStatusChange(
73 content::PermissionType permission, 65 content::PermissionType permission,
74 const GURL& requesting_origin, 66 const GURL& requesting_origin,
75 const GURL& embedding_origin, 67 const GURL& embedding_origin,
76 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) 68 const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
77 override; 69 override;
78 void UnsubscribePermissionStatusChange(int subscription_id) override; 70 void UnsubscribePermissionStatusChange(int subscription_id) override;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 std::unique_ptr<PermissionContextBase>, 108 std::unique_ptr<PermissionContextBase>,
117 PermissionTypeHash> 109 PermissionTypeHash>
118 permission_contexts_; 110 permission_contexts_;
119 111
120 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_; 112 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
121 113
122 DISALLOW_COPY_AND_ASSIGN(PermissionManager); 114 DISALLOW_COPY_AND_ASSIGN(PermissionManager);
123 }; 115 };
124 116
125 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_ 117 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698