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

Side by Side Diff: chrome/browser/content_settings/permission_context_base.cc

Issue 819463002: Implement RevokePermission() method in PermissionService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 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 "chrome/browser/content_settings/permission_context_base.h" 5 #include "chrome/browser/content_settings/permission_context_base.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h" 9 #include "chrome/browser/content_settings/permission_bubble_request_impl.h"
10 #include "chrome/browser/content_settings/permission_context_uma_util.h" 10 #include "chrome/browser/content_settings/permission_context_uma_util.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 callback); 47 callback);
48 } 48 }
49 49
50 ContentSetting PermissionContextBase::GetPermissionStatus( 50 ContentSetting PermissionContextBase::GetPermissionStatus(
51 const GURL& requesting_origin, 51 const GURL& requesting_origin,
52 const GURL& embedding_origin) const { 52 const GURL& embedding_origin) const {
53 return profile_->GetHostContentSettingsMap()->GetContentSetting( 53 return profile_->GetHostContentSettingsMap()->GetContentSetting(
54 requesting_origin, embedding_origin, permission_type_, std::string()); 54 requesting_origin, embedding_origin, permission_type_, std::string());
55 } 55 }
56 56
57 ContentSetting PermissionContextBase::RevokePermission(
58 const GURL& requesting_origin,
59 const GURL& embedding_origin) {
60 profile_->GetHostContentSettingsMap()->SetContentSetting(
61 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
62 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
63 permission_type_, std::string(), CONTENT_SETTING_DEFAULT);
mlamouri (slow - plz ping) 2014/12/19 13:08:03 We should make sure that it goes back to CONTENT_S
timvolodine 2015/01/22 19:37:01 Done.
64
65 return GetPermissionStatus(requesting_origin, embedding_origin);
66 }
67
57 void PermissionContextBase::CancelPermissionRequest( 68 void PermissionContextBase::CancelPermissionRequest(
58 content::WebContents* web_contents, 69 content::WebContents* web_contents,
59 const PermissionRequestID& id) { 70 const PermissionRequestID& id) {
60 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 71 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
61 72
62 if (PermissionBubbleManager::Enabled()) { 73 if (PermissionBubbleManager::Enabled()) {
63 PermissionBubbleRequest* cancelling = 74 PermissionBubbleRequest* cancelling =
64 pending_bubbles_.get(id.ToString()); 75 pending_bubbles_.get(id.ToString());
65 if (cancelling != NULL && web_contents != NULL && 76 if (cancelling != NULL && web_contents != NULL &&
66 PermissionBubbleManager::FromWebContents(web_contents) != NULL) { 77 PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 size_t success = pending_bubbles_.erase(id.ToString()); 202 size_t success = pending_bubbles_.erase(id.ToString());
192 DCHECK(success == 1) << "Missing request " << id.ToString(); 203 DCHECK(success == 1) << "Missing request " << id.ToString();
193 } 204 }
194 205
195 void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin, 206 void PermissionContextBase::UpdateContentSetting(const GURL& requesting_origin,
196 const GURL& embedding_origin, 207 const GURL& embedding_origin,
197 bool allowed) { 208 bool allowed) {
198 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); 209 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
199 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); 210 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
200 ContentSetting content_setting = 211 ContentSetting content_setting =
201 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; 212 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
202 profile_->GetHostContentSettingsMap()->SetContentSetting( 213 profile_->GetHostContentSettingsMap()->SetContentSetting(
203 ContentSettingsPattern::FromURLNoWildcard(requesting_origin), 214 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
204 ContentSettingsPattern::FromURLNoWildcard(embedding_origin), 215 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
205 permission_type_, std::string(), content_setting); 216 permission_type_, std::string(), content_setting);
206 } 217 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698