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

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

Issue 2686463002: Add a source to the result of PermissionContextBase::GetPermissionStatus (Closed)
Patch Set: Add a source to the result of PermissionContextBase::GetPermissionStatus Created 3 years, 10 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
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 #include "chrome/browser/permissions/permission_manager.h" 5 #include "chrome/browser/permissions/permission_manager.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 479 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 } 490 }
491 491
492 ContentSetting PermissionManager::GetPermissionStatusInternal( 492 ContentSetting PermissionManager::GetPermissionStatusInternal(
493 PermissionType permission, 493 PermissionType permission,
494 const GURL& requesting_origin, 494 const GURL& requesting_origin,
495 const GURL& embedding_origin) { 495 const GURL& embedding_origin) {
496 if (IsConstantPermission(permission)) 496 if (IsConstantPermission(permission))
497 return GetContentSettingForConstantPermission(permission); 497 return GetContentSettingForConstantPermission(permission);
498 498
499 PermissionContextBase* context = GetPermissionContext(permission); 499 PermissionContextBase* context = GetPermissionContext(permission);
500 return context->GetPermissionStatus(requesting_origin.GetOrigin(), 500 return context
501 embedding_origin.GetOrigin()); 501 ->GetPermissionStatus(requesting_origin.GetOrigin(),
502 embedding_origin.GetOrigin())
503 .content_setting;
502 } 504 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698