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

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: Fixing ContentSetting Register. 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_PLUGINS || 248 content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
249 content_type == CONTENT_SETTINGS_TYPE_COOKIES || 249 content_type == CONTENT_SETTINGS_TYPE_COOKIES ||
250 content_type == CONTENT_SETTINGS_TYPE_POPUPS || 250 content_type == CONTENT_SETTINGS_TYPE_POPUPS ||
251 content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT || 251 content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT ||
252 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC || 252 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC ||
253 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA || 253 content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA ||
254 content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER || 254 content_type == CONTENT_SETTINGS_TYPE_PPAPI_BROKER ||
255 content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS || 255 content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS ||
256 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) { 256 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX ||
257 content_type == CONTENT_SETTINGS_TYPE_KEYGEN) {
257 const auto& it = content_settings_status_.find(content_type); 258 const auto& it = content_settings_status_.find(content_type);
258 if (it != content_settings_status_.end()) 259 if (it != content_settings_status_.end())
259 return it->second.blocked; 260 return it->second.blocked;
260 } 261 }
261 262
262 return false; 263 return false;
263 } 264 }
264 265
265 bool TabSpecificContentSettings::IsBlockageIndicated( 266 bool TabSpecificContentSettings::IsBlockageIndicated(
266 ContentSettingsType content_type) const { 267 ContentSettingsType content_type) const {
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
848 static_cast<MicrophoneCameraStateFlags>( 849 static_cast<MicrophoneCameraStateFlags>(
849 TabSpecificContentSettings::MICROPHONE_ACCESSED | 850 TabSpecificContentSettings::MICROPHONE_ACCESSED |
850 TabSpecificContentSettings::MICROPHONE_BLOCKED | 851 TabSpecificContentSettings::MICROPHONE_BLOCKED |
851 TabSpecificContentSettings::CAMERA_ACCESSED | 852 TabSpecificContentSettings::CAMERA_ACCESSED |
852 TabSpecificContentSettings::CAMERA_BLOCKED); 853 TabSpecificContentSettings::CAMERA_BLOCKED);
853 OnMediaStreamPermissionSet( 854 OnMediaStreamPermissionSet(
854 web_contents()->GetLastCommittedURL(), 855 web_contents()->GetLastCommittedURL(),
855 media_blocked, 856 media_blocked,
856 std::string(), std::string(), std::string(), std::string()); 857 std::string(), std::string(), std::string(), std::string());
857 } 858 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698