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

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

Issue 769103002: Refactor ProtectedMediaIdentifierPermissionContext to derive from PermissionContextBase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add #ifdef OS_CHROMEOS and clean-up includes 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 } 161 }
162 162
163 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 163 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
164 persist, allowed); 164 persist, allowed);
165 } 165 }
166 166
167 PermissionQueueController* PermissionContextBase::GetQueueController() { 167 PermissionQueueController* PermissionContextBase::GetQueueController() {
168 return permission_queue_controller_.get(); 168 return permission_queue_controller_.get();
169 } 169 }
170 170
171 Profile* PermissionContextBase::profile() const {
172 return profile_;
173 }
174
171 void PermissionContextBase::NotifyPermissionSet( 175 void PermissionContextBase::NotifyPermissionSet(
172 const PermissionRequestID& id, 176 const PermissionRequestID& id,
173 const GURL& requesting_origin, 177 const GURL& requesting_origin,
174 const GURL& embedding_origin, 178 const GURL& embedding_origin,
175 const BrowserPermissionCallback& callback, 179 const BrowserPermissionCallback& callback,
176 bool persist, 180 bool persist,
177 bool allowed) { 181 bool allowed) {
178 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 182 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
179 if (persist) 183 if (persist)
180 UpdateContentSetting(requesting_origin, embedding_origin, allowed); 184 UpdateContentSetting(requesting_origin, embedding_origin, allowed);
(...skipping 12 matching lines...) Expand all
193 bool allowed) { 197 bool allowed) {
194 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin()); 198 DCHECK_EQ(requesting_origin, requesting_origin.GetOrigin());
195 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin()); 199 DCHECK_EQ(embedding_origin, embedding_origin.GetOrigin());
196 ContentSetting content_setting = 200 ContentSetting content_setting =
197 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK; 201 allowed ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK;
198 profile_->GetHostContentSettingsMap()->SetContentSetting( 202 profile_->GetHostContentSettingsMap()->SetContentSetting(
199 ContentSettingsPattern::FromURLNoWildcard(requesting_origin), 203 ContentSettingsPattern::FromURLNoWildcard(requesting_origin),
200 ContentSettingsPattern::FromURLNoWildcard(embedding_origin), 204 ContentSettingsPattern::FromURLNoWildcard(embedding_origin),
201 permission_type_, std::string(), content_setting); 205 permission_type_, std::string(), content_setting);
202 } 206 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698