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

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

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing keygen_rules. Created 5 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/tab_specific_content_settings.h" 5 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 << "Geolocation settings handled by ContentSettingGeolocationImageModel"; 238 << "Geolocation settings handled by ContentSettingGeolocationImageModel";
239 DCHECK_NE(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, content_type) 239 DCHECK_NE(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, content_type)
240 << "Notifications settings handled by " 240 << "Notifications settings handled by "
241 << "ContentSettingsNotificationsImageModel"; 241 << "ContentSettingsNotificationsImageModel";
242 DCHECK_NE(CONTENT_SETTINGS_TYPE_MEDIASTREAM, content_type) 242 DCHECK_NE(CONTENT_SETTINGS_TYPE_MEDIASTREAM, content_type)
243 << "The Mediastream content setting is deprecated. " 243 << "The Mediastream content setting is deprecated. "
244 << "Call IsContentBlocked for camera and microphone settings instead."; 244 << "Call IsContentBlocked for camera and microphone settings instead.";
245 245
246 if (content_type == CONTENT_SETTINGS_TYPE_IMAGES || 246 if (content_type == CONTENT_SETTINGS_TYPE_IMAGES ||
247 content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT || 247 content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
248 content_type == CONTENT_SETTINGS_TYPE_KEYGEN ||
248 content_type == CONTENT_SETTINGS_TYPE_PLUGINS || 249 content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
249 content_type == CONTENT_SETTINGS_TYPE_COOKIES || 250 content_type == CONTENT_SETTINGS_TYPE_COOKIES ||
250 content_type == CONTENT_SETTINGS_TYPE_POPUPS || 251 content_type == CONTENT_SETTINGS_TYPE_POPUPS ||
251 content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT || 252 content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT ||
252 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || 253 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
253 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA || 254 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
254 content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER || 255 content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
255 content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS || 256 content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||
256 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) { 257 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
257 const auto& it = content_settings_status_.find(content_type); 258 const auto& it = content_settings_status_.find(content_type);
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
820 821
821 void TabSpecificContentSettings::GeolocationDidNavigate( 822 void TabSpecificContentSettings::GeolocationDidNavigate(
822 const content::LoadCommittedDetails& details) { 823 const content::LoadCommittedDetails& details) {
823 geolocation_usages_state_.DidNavigate(GetCommittedDetails(details)); 824 geolocation_usages_state_.DidNavigate(GetCommittedDetails(details));
824 } 825 }
825 826
826 void TabSpecificContentSettings::MidiDidNavigate( 827 void TabSpecificContentSettings::MidiDidNavigate(
827 const content::LoadCommittedDetails& details) { 828 const content::LoadCommittedDetails& details) {
828 midi_usages_state_.DidNavigate(GetCommittedDetails(details)); 829 midi_usages_state_.DidNavigate(GetCommittedDetails(details));
829 } 830 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698