OLD | NEW |
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 #include "content/browser/permissions/permission_service_impl.h" | 5 #include "content/browser/permissions/permission_service_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType( | 219 PermissionStatus PermissionServiceImpl::GetPermissionStatusFromType( |
220 PermissionType type, | 220 PermissionType type, |
221 const url::Origin& origin) { | 221 const url::Origin& origin) { |
222 BrowserContext* browser_context = context_->GetBrowserContext(); | 222 BrowserContext* browser_context = context_->GetBrowserContext(); |
223 DCHECK(browser_context); | 223 DCHECK(browser_context); |
224 if (!browser_context->GetPermissionManager()) | 224 if (!browser_context->GetPermissionManager()) |
225 return PermissionStatus::DENIED; | 225 return PermissionStatus::DENIED; |
226 | 226 |
227 GURL requesting_origin(origin.Serialize()); | 227 GURL requesting_origin(origin.Serialize()); |
228 // If the embedding_origin is empty we'll use |origin| instead. | 228 if (context_->render_frame_host()) { |
229 GURL embedding_origin = context_->GetEmbeddingOrigin(); | 229 return browser_context->GetPermissionManager()->GetPermissionStatusForFrame( |
230 return browser_context->GetPermissionManager()->GetPermissionStatus( | 230 type, context_->render_frame_host(), requesting_origin); |
231 type, requesting_origin, | 231 } else { |
232 embedding_origin.is_empty() ? requesting_origin : embedding_origin); | 232 return browser_context->GetPermissionManager() |
| 233 ->GetPermissionStatusForWorker(type, requesting_origin); |
| 234 } |
233 } | 235 } |
234 | 236 |
235 void PermissionServiceImpl::ResetPermissionStatus(PermissionType type, | 237 void PermissionServiceImpl::ResetPermissionStatus(PermissionType type, |
236 const url::Origin& origin) { | 238 const url::Origin& origin) { |
237 BrowserContext* browser_context = context_->GetBrowserContext(); | 239 BrowserContext* browser_context = context_->GetBrowserContext(); |
238 DCHECK(browser_context); | 240 DCHECK(browser_context); |
239 if (!browser_context->GetPermissionManager()) | 241 if (!browser_context->GetPermissionManager()) |
240 return; | 242 return; |
241 | 243 |
242 GURL requesting_origin(origin.Serialize()); | 244 GURL requesting_origin(origin.Serialize()); |
243 // If the embedding_origin is empty we'll use |origin| instead. | 245 // If the embedding_origin is empty we'll use |origin| instead. |
244 GURL embedding_origin = context_->GetEmbeddingOrigin(); | 246 GURL embedding_origin = context_->GetEmbeddingOrigin(); |
245 browser_context->GetPermissionManager()->ResetPermission( | 247 browser_context->GetPermissionManager()->ResetPermission( |
246 type, requesting_origin, | 248 type, requesting_origin, |
247 embedding_origin.is_empty() ? requesting_origin : embedding_origin); | 249 embedding_origin.is_empty() ? requesting_origin : embedding_origin); |
248 } | 250 } |
249 | 251 |
250 } // namespace content | 252 } // namespace content |
OLD | NEW |