OLD | NEW |
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 #include "content/shell/browser/layout_test/layout_test_permission_manager.h" | 5 #include "content/shell/browser/layout_test/layout_test_permission_manager.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
12 #include "content/public/browser/permission_type.h" | 12 #include "content/public/browser/permission_type.h" |
13 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
14 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h
" | 14 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h
" |
15 #include "content/shell/browser/layout_test/layout_test_notification_manager.h" | 15 #include "content/shell/browser/layout_test/layout_test_notification_manager.h" |
16 | 16 |
17 namespace content { | 17 namespace content { |
18 | 18 |
19 struct LayoutTestPermissionManager::Subscription { | 19 struct LayoutTestPermissionManager::Subscription { |
20 PermissionDescription permission; | 20 PermissionDescription permission; |
21 base::Callback<void(permissions::mojom::PermissionStatus)> callback; | 21 base::Callback<void(blink::mojom::PermissionStatus)> callback; |
22 permissions::mojom::PermissionStatus current_value; | 22 blink::mojom::PermissionStatus current_value; |
23 }; | 23 }; |
24 | 24 |
25 LayoutTestPermissionManager::PermissionDescription::PermissionDescription( | 25 LayoutTestPermissionManager::PermissionDescription::PermissionDescription( |
26 PermissionType type, | 26 PermissionType type, |
27 const GURL& origin, | 27 const GURL& origin, |
28 const GURL& embedding_origin) | 28 const GURL& embedding_origin) |
29 : type(type), | 29 : type(type), |
30 origin(origin), | 30 origin(origin), |
31 embedding_origin(embedding_origin) { | 31 embedding_origin(embedding_origin) { |
32 } | 32 } |
(...skipping 25 matching lines...) Expand all Loading... |
58 : PermissionManager() { | 58 : PermissionManager() { |
59 } | 59 } |
60 | 60 |
61 LayoutTestPermissionManager::~LayoutTestPermissionManager() { | 61 LayoutTestPermissionManager::~LayoutTestPermissionManager() { |
62 } | 62 } |
63 | 63 |
64 int LayoutTestPermissionManager::RequestPermission( | 64 int LayoutTestPermissionManager::RequestPermission( |
65 PermissionType permission, | 65 PermissionType permission, |
66 RenderFrameHost* render_frame_host, | 66 RenderFrameHost* render_frame_host, |
67 const GURL& requesting_origin, | 67 const GURL& requesting_origin, |
68 const base::Callback<void(permissions::mojom::PermissionStatus)>& | 68 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) { |
69 callback) { | |
70 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 69 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
71 | 70 |
72 callback.Run(GetPermissionStatus( | 71 callback.Run(GetPermissionStatus( |
73 permission, requesting_origin, | 72 permission, requesting_origin, |
74 WebContents::FromRenderFrameHost(render_frame_host) | 73 WebContents::FromRenderFrameHost(render_frame_host) |
75 ->GetLastCommittedURL().GetOrigin())); | 74 ->GetLastCommittedURL().GetOrigin())); |
76 return kNoPendingOperation; | 75 return kNoPendingOperation; |
77 } | 76 } |
78 | 77 |
79 int LayoutTestPermissionManager::RequestPermissions( | 78 int LayoutTestPermissionManager::RequestPermissions( |
80 const std::vector<PermissionType>& permissions, | 79 const std::vector<PermissionType>& permissions, |
81 content::RenderFrameHost* render_frame_host, | 80 content::RenderFrameHost* render_frame_host, |
82 const GURL& requesting_origin, | 81 const GURL& requesting_origin, |
83 const base::Callback<void( | 82 const base::Callback< |
84 const std::vector<permissions::mojom::PermissionStatus>&)>& callback) { | 83 void(const std::vector<blink::mojom::PermissionStatus>&)>& callback) { |
85 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 84 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
86 | 85 |
87 std::vector<permissions::mojom::PermissionStatus> result(permissions.size()); | 86 std::vector<blink::mojom::PermissionStatus> result(permissions.size()); |
88 const GURL& embedding_origin = | 87 const GURL& embedding_origin = |
89 WebContents::FromRenderFrameHost(render_frame_host) | 88 WebContents::FromRenderFrameHost(render_frame_host) |
90 ->GetLastCommittedURL().GetOrigin(); | 89 ->GetLastCommittedURL().GetOrigin(); |
91 for (const auto& permission : permissions) { | 90 for (const auto& permission : permissions) { |
92 result.push_back(GetPermissionStatus( | 91 result.push_back(GetPermissionStatus( |
93 permission, requesting_origin, embedding_origin)); | 92 permission, requesting_origin, embedding_origin)); |
94 } | 93 } |
95 | 94 |
96 callback.Run(result); | 95 callback.Run(result); |
97 return kNoPendingOperation; | 96 return kNoPendingOperation; |
(...skipping 11 matching lines...) Expand all Loading... |
109 | 108 |
110 base::AutoLock lock(permissions_lock_); | 109 base::AutoLock lock(permissions_lock_); |
111 | 110 |
112 auto it = permissions_.find( | 111 auto it = permissions_.find( |
113 PermissionDescription(permission, requesting_origin, embedding_origin)); | 112 PermissionDescription(permission, requesting_origin, embedding_origin)); |
114 if (it == permissions_.end()) | 113 if (it == permissions_.end()) |
115 return; | 114 return; |
116 permissions_.erase(it); | 115 permissions_.erase(it); |
117 } | 116 } |
118 | 117 |
119 permissions::mojom::PermissionStatus | 118 blink::mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus( |
120 LayoutTestPermissionManager::GetPermissionStatus(PermissionType permission, | 119 PermissionType permission, |
121 const GURL& requesting_origin, | 120 const GURL& requesting_origin, |
122 const GURL& embedding_origin) { | 121 const GURL& embedding_origin) { |
123 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || | 122 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) || |
124 BrowserThread::CurrentlyOn(BrowserThread::IO)); | 123 BrowserThread::CurrentlyOn(BrowserThread::IO)); |
125 | 124 |
126 base::AutoLock lock(permissions_lock_); | 125 base::AutoLock lock(permissions_lock_); |
127 | 126 |
128 auto it = permissions_.find( | 127 auto it = permissions_.find( |
129 PermissionDescription(permission, requesting_origin, embedding_origin)); | 128 PermissionDescription(permission, requesting_origin, embedding_origin)); |
130 if (it == permissions_.end()) | 129 if (it == permissions_.end()) |
131 return permissions::mojom::PermissionStatus::DENIED; | 130 return blink::mojom::PermissionStatus::DENIED; |
132 return it->second; | 131 return it->second; |
133 } | 132 } |
134 | 133 |
135 void LayoutTestPermissionManager::RegisterPermissionUsage( | 134 void LayoutTestPermissionManager::RegisterPermissionUsage( |
136 PermissionType permission, | 135 PermissionType permission, |
137 const GURL& requesting_origin, | 136 const GURL& requesting_origin, |
138 const GURL& embedding_origin) { | 137 const GURL& embedding_origin) { |
139 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 138 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
140 } | 139 } |
141 | 140 |
142 int LayoutTestPermissionManager::SubscribePermissionStatusChange( | 141 int LayoutTestPermissionManager::SubscribePermissionStatusChange( |
143 PermissionType permission, | 142 PermissionType permission, |
144 const GURL& requesting_origin, | 143 const GURL& requesting_origin, |
145 const GURL& embedding_origin, | 144 const GURL& embedding_origin, |
146 const base::Callback<void(permissions::mojom::PermissionStatus)>& | 145 const base::Callback<void(blink::mojom::PermissionStatus)>& callback) { |
147 callback) { | |
148 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 146 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
149 | 147 |
150 Subscription* subscription = new Subscription(); | 148 Subscription* subscription = new Subscription(); |
151 subscription->permission = | 149 subscription->permission = |
152 PermissionDescription(permission, requesting_origin, embedding_origin); | 150 PermissionDescription(permission, requesting_origin, embedding_origin); |
153 subscription->callback = callback; | 151 subscription->callback = callback; |
154 subscription->current_value = | 152 subscription->current_value = |
155 GetPermissionStatus(permission, | 153 GetPermissionStatus(permission, |
156 subscription->permission.origin, | 154 subscription->permission.origin, |
157 subscription->permission.embedding_origin); | 155 subscription->permission.embedding_origin); |
158 | 156 |
159 return subscriptions_.Add(subscription); | 157 return subscriptions_.Add(subscription); |
160 } | 158 } |
161 | 159 |
162 void LayoutTestPermissionManager::UnsubscribePermissionStatusChange( | 160 void LayoutTestPermissionManager::UnsubscribePermissionStatusChange( |
163 int subscription_id) { | 161 int subscription_id) { |
164 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 162 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
165 | 163 |
166 // Whether |subscription_id| is known will be checked by the Remove() call. | 164 // Whether |subscription_id| is known will be checked by the Remove() call. |
167 subscriptions_.Remove(subscription_id); | 165 subscriptions_.Remove(subscription_id); |
168 } | 166 } |
169 | 167 |
170 void LayoutTestPermissionManager::SetPermission( | 168 void LayoutTestPermissionManager::SetPermission( |
171 PermissionType permission, | 169 PermissionType permission, |
172 permissions::mojom::PermissionStatus status, | 170 blink::mojom::PermissionStatus status, |
173 const GURL& origin, | 171 const GURL& origin, |
174 const GURL& embedding_origin) { | 172 const GURL& embedding_origin) { |
175 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 173 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
176 | 174 |
177 PermissionDescription description(permission, origin, embedding_origin); | 175 PermissionDescription description(permission, origin, embedding_origin); |
178 | 176 |
179 base::AutoLock lock(permissions_lock_); | 177 base::AutoLock lock(permissions_lock_); |
180 | 178 |
181 auto it = permissions_.find(description); | 179 auto it = permissions_.find(description); |
182 if (it == permissions_.end()) { | 180 if (it == permissions_.end()) { |
183 permissions_.insert( | 181 permissions_.insert( |
184 std::pair<PermissionDescription, permissions::mojom::PermissionStatus>( | 182 std::pair<PermissionDescription, blink::mojom::PermissionStatus>( |
185 description, status)); | 183 description, status)); |
186 } else { | 184 } else { |
187 it->second = status; | 185 it->second = status; |
188 } | 186 } |
189 | 187 |
190 OnPermissionChanged(description, status); | 188 OnPermissionChanged(description, status); |
191 } | 189 } |
192 | 190 |
193 void LayoutTestPermissionManager::ResetPermissions() { | 191 void LayoutTestPermissionManager::ResetPermissions() { |
194 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 192 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
195 | 193 |
196 base::AutoLock lock(permissions_lock_); | 194 base::AutoLock lock(permissions_lock_); |
197 permissions_.clear(); | 195 permissions_.clear(); |
198 } | 196 } |
199 | 197 |
200 void LayoutTestPermissionManager::OnPermissionChanged( | 198 void LayoutTestPermissionManager::OnPermissionChanged( |
201 const PermissionDescription& permission, | 199 const PermissionDescription& permission, |
202 permissions::mojom::PermissionStatus status) { | 200 blink::mojom::PermissionStatus status) { |
203 std::list<base::Closure> callbacks; | 201 std::list<base::Closure> callbacks; |
204 | 202 |
205 for (SubscriptionsMap::iterator iter(&subscriptions_); | 203 for (SubscriptionsMap::iterator iter(&subscriptions_); |
206 !iter.IsAtEnd(); iter.Advance()) { | 204 !iter.IsAtEnd(); iter.Advance()) { |
207 Subscription* subscription = iter.GetCurrentValue(); | 205 Subscription* subscription = iter.GetCurrentValue(); |
208 if (subscription->permission != permission) | 206 if (subscription->permission != permission) |
209 continue; | 207 continue; |
210 | 208 |
211 if (subscription->current_value == status) | 209 if (subscription->current_value == status) |
212 continue; | 210 continue; |
213 | 211 |
214 subscription->current_value = status; | 212 subscription->current_value = status; |
215 | 213 |
216 // Add the callback to |callbacks| which will be run after the loop to | 214 // Add the callback to |callbacks| which will be run after the loop to |
217 // prevent re-entrance issues. | 215 // prevent re-entrance issues. |
218 callbacks.push_back(base::Bind(subscription->callback, status)); | 216 callbacks.push_back(base::Bind(subscription->callback, status)); |
219 } | 217 } |
220 | 218 |
221 for (const auto& callback : callbacks) | 219 for (const auto& callback : callbacks) |
222 callback.Run(); | 220 callback.Run(); |
223 } | 221 } |
224 | 222 |
225 } // namespace content | 223 } // namespace content |
OLD | NEW |