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

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

Issue 579673003: Move content_settings_observer.h, content_settings_provider.h, content_settings_rule.* to the compo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: last comment Created 6 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 (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/content_settings_utils.h" 5 #include "chrome/browser/content_settings/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"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/scoped_vector.h" 12 #include "base/memory/scoped_vector.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/content_settings/content_settings_provider.h"
16 #include "chrome/browser/content_settings/content_settings_rule.h"
17 #include "chrome/browser/content_settings/host_content_settings_map.h" 15 #include "chrome/browser/content_settings/host_content_settings_map.h"
18 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "components/content_settings/core/browser/content_settings_provider.h"
18 #include "components/content_settings/core/browser/content_settings_rule.h"
19 #include "components/content_settings/core/common/content_settings_pattern.h" 19 #include "components/content_settings/core/common/content_settings_pattern.h"
20 #include "url/gurl.h" 20 #include "url/gurl.h"
21 21
22 namespace { 22 namespace {
23 23
24 // The names of the ContentSettingsType values, for use with dictionary prefs. 24 // The names of the ContentSettingsType values, for use with dictionary prefs.
25 const char* kTypeNames[] = { 25 const char* kTypeNames[] = {
26 "cookies", 26 "cookies",
27 "images", 27 "images",
28 "javascript", 28 "javascript",
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 void GetRendererContentSettingRules(const HostContentSettingsMap* map, 244 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
245 RendererContentSettingRules* rules) { 245 RendererContentSettingRules* rules) {
246 map->GetSettingsForOneType( 246 map->GetSettingsForOneType(
247 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules)); 247 CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
248 map->GetSettingsForOneType( 248 map->GetSettingsForOneType(
249 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules)); 249 CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
250 } 250 }
251 251
252 } // namespace content_settings 252 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698