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

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

Issue 2439673004: Add threadsafe version of PermissionManager::GetPermissionStatus (Closed)
Patch Set: Use thread_bundle_ REAL_IO_THREAD to ensure multi-thread testing 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;
20 class PermissionContextBase; 21 class PermissionContextBase;
21 class Profile; 22 class Profile;
22 23
23 namespace content { 24 namespace content {
24 enum class PermissionType; 25 enum class PermissionType;
25 class WebContents; 26 class WebContents;
26 }; // namespace content 27 }; // namespace content
27 28
28 class PermissionManager : public KeyedService, 29 class PermissionManager : public KeyedService,
29 public content::PermissionManager, 30 public content::PermissionManager,
(...skipping 21 matching lines...) Expand all
51 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) 52 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback)
52 override; 53 override;
53 void CancelPermissionRequest(int request_id) override; 54 void CancelPermissionRequest(int request_id) override;
54 void ResetPermission(content::PermissionType permission, 55 void ResetPermission(content::PermissionType permission,
55 const GURL& requesting_origin, 56 const GURL& requesting_origin,
56 const GURL& embedding_origin) override; 57 const GURL& embedding_origin) override;
57 blink::mojom::PermissionStatus GetPermissionStatus( 58 blink::mojom::PermissionStatus GetPermissionStatus(
58 content::PermissionType permission, 59 content::PermissionType permission,
59 const GURL& requesting_origin, 60 const GURL& requesting_origin,
60 const GURL& embedding_origin) override; 61 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
61 void RegisterPermissionUsage(content::PermissionType permission, 69 void RegisterPermissionUsage(content::PermissionType permission,
62 const GURL& requesting_origin, 70 const GURL& requesting_origin,
63 const GURL& embedding_origin) override; 71 const GURL& embedding_origin) override;
64 int SubscribePermissionStatusChange( 72 int SubscribePermissionStatusChange(
65 content::PermissionType permission, 73 content::PermissionType permission,
66 const GURL& requesting_origin, 74 const GURL& requesting_origin,
67 const GURL& embedding_origin, 75 const GURL& embedding_origin,
68 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) 76 const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
69 override; 77 override;
70 void UnsubscribePermissionStatusChange(int subscription_id) override; 78 void UnsubscribePermissionStatusChange(int subscription_id) override;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 std::unique_ptr<PermissionContextBase>, 116 std::unique_ptr<PermissionContextBase>,
109 PermissionTypeHash> 117 PermissionTypeHash>
110 permission_contexts_; 118 permission_contexts_;
111 119
112 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_; 120 base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
113 121
114 DISALLOW_COPY_AND_ASSIGN(PermissionManager); 122 DISALLOW_COPY_AND_ASSIGN(PermissionManager);
115 }; 123 };
116 124
117 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_ 125 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698