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

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

Issue 1311783007: refactor to Introduce AUDIO_CAPTURE and VIDEO_CAPTURE permissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 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/permissions/permission_context_base.h" 5 #include "chrome/browser/permissions/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/permissions/permission_bubble_request_impl.h" 9 #include "chrome/browser/permissions/permission_bubble_request_impl.h"
10 #include "chrome/browser/permissions/permission_context_uma_util.h" 10 #include "chrome/browser/permissions/permission_context_uma_util.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 } 201 }
202 202
203 PermissionQueueController* PermissionContextBase::GetQueueController() { 203 PermissionQueueController* PermissionContextBase::GetQueueController() {
204 return permission_queue_controller_.get(); 204 return permission_queue_controller_.get();
205 } 205 }
206 206
207 Profile* PermissionContextBase::profile() const { 207 Profile* PermissionContextBase::profile() const {
208 return profile_; 208 return profile_;
209 } 209 }
210 210
211 ContentSettingsType PermissionContextBase::content_settings_type() const {
212 return permission_type_;
213 }
214
211 void PermissionContextBase::NotifyPermissionSet( 215 void PermissionContextBase::NotifyPermissionSet(
212 const PermissionRequestID& id, 216 const PermissionRequestID& id,
213 const GURL& requesting_origin, 217 const GURL& requesting_origin,
214 const GURL& embedding_origin, 218 const GURL& embedding_origin,
215 const BrowserPermissionCallback& callback, 219 const BrowserPermissionCallback& callback,
216 bool persist, 220 bool persist,
217 ContentSetting content_setting) { 221 ContentSetting content_setting) {
218 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 222 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
219 223
220 if (persist) 224 if (persist)
(...skipping 24 matching lines...) Expand all
245 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); 249 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
246 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); 250 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
247 DCHECK(content_setting == CONTENT_SETTING_ALLOW || 251 DCHECK(content_setting == CONTENT_SETTING_ALLOW ||
248 content_setting == CONTENT_SETTING_BLOCK); 252 content_setting == CONTENT_SETTING_BLOCK);
249 253
250 profile_->GetHostContentSettingsMap()->SetContentSetting( 254 profile_->GetHostContentSettingsMap()->SetContentSetting(
251 ContentSettingsPattern::FromURLNoWildcard(requesting_origin), 255 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
252 ContentSettingsPattern::FromURLNoWildcard(embedding_origin), 256 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
253 permission_type_, std::string(), content_setting); 257 permission_type_, std::string(), content_setting);
254 } 258 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698