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

Side by Side Diff: content/browser/permissions/permission_service_impl.cc

Issue 2617863003: Restore logic to unsubscribe from permission changes on frame change. (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « content/browser/permissions/permission_service_context.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 PermissionDescriptorPtr permission, 250 PermissionDescriptorPtr permission,
251 const url::Origin& origin, 251 const url::Origin& origin,
252 PermissionStatus last_known_status, 252 PermissionStatus last_known_status,
253 PermissionObserverPtr observer) { 253 PermissionObserverPtr observer) {
254 PermissionStatus current_status = GetPermissionStatus(permission, origin); 254 PermissionStatus current_status = GetPermissionStatus(permission, origin);
255 if (current_status != last_known_status) { 255 if (current_status != last_known_status) {
256 observer->OnPermissionStatusChange(current_status); 256 observer->OnPermissionStatusChange(current_status);
257 last_known_status = current_status; 257 last_known_status = current_status;
258 } 258 }
259 259
260 BrowserContext* browser_context = context_->GetBrowserContext();
261 DCHECK(browser_context);
262 if (!browser_context->GetPermissionManager())
263 return;
264
265 context_->CreateSubscription(PermissionDescriptorToPermissionType(permission), 260 context_->CreateSubscription(PermissionDescriptorToPermissionType(permission),
266 origin, std::move(observer)); 261 origin, std::move(observer));
267 } 262 }
268 263
269 PermissionStatus PermissionServiceImpl::GetPermissionStatus( 264 PermissionStatus PermissionServiceImpl::GetPermissionStatus(
270 const PermissionDescriptorPtr& permission, 265 const PermissionDescriptorPtr& permission,
271 const url::Origin& origin) { 266 const url::Origin& origin) {
272 return GetPermissionStatusFromType( 267 return GetPermissionStatusFromType(
273 PermissionDescriptorToPermissionType(permission), origin); 268 PermissionDescriptorToPermissionType(permission), origin);
274 } 269 }
(...skipping 23 matching lines...) Expand all
298 293
299 GURL requesting_origin(origin.Serialize()); 294 GURL requesting_origin(origin.Serialize());
300 // If the embedding_origin is empty we'll use |origin| instead. 295 // If the embedding_origin is empty we'll use |origin| instead.
301 GURL embedding_origin = context_->GetEmbeddingOrigin(); 296 GURL embedding_origin = context_->GetEmbeddingOrigin();
302 browser_context->GetPermissionManager()->ResetPermission( 297 browser_context->GetPermissionManager()->ResetPermission(
303 type, requesting_origin, 298 type, requesting_origin,
304 embedding_origin.is_empty() ? requesting_origin : embedding_origin); 299 embedding_origin.is_empty() ? requesting_origin : embedding_origin);
305 } 300 }
306 301
307 } // namespace content 302 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/permissions/permission_service_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698