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

Side by Side Diff: components/content_settings/core/browser/content_settings_utils.cc

Issue 1417173010: Adding <keygen> Content Setting (core) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing test_runner. 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 "components/content_settings/core/browser/content_settings_utils.h" 5 #include "components/content_settings/core/browser/content_settings_utils.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 188 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
189 RendererContentSettingRules* rules) { 189 RendererContentSettingRules* rules) {
190 map->GetSettingsForOneType( 190 map->GetSettingsForOneType(
191 CONTENT_SETTINGS_TYPE_IMAGES, 191 CONTENT_SETTINGS_TYPE_IMAGES,
192 ResourceIdentifier(), 192 ResourceIdentifier(),
193 &(rules->image_rules)); 193 &(rules->image_rules));
194 map->GetSettingsForOneType( 194 map->GetSettingsForOneType(
195 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 195 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
196 ResourceIdentifier(), 196 ResourceIdentifier(),
197 &(rules->script_rules)); 197 &(rules->script_rules));
198 map->GetSettingsForOneType(
199 CONTENT_SETTINGS_TYPE_KEYGEN,
200 ResourceIdentifier(),
201 &(rules->keygen_rules));
198 } 202 }
199 203
200 } // namespace content_settings 204 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698