| Index: chrome/browser/content_settings/host_content_settings_map.cc
|
| diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
|
| similarity index 99%
|
| rename from chrome/browser/host_content_settings_map.cc
|
| rename to chrome/browser/content_settings/host_content_settings_map.cc
|
| index 8605f2eb51152c43a96ed344d0c3cec1d6f8a673..5e167a74e6bb467b8e17010e7a37b617d8d4c65b 100644
|
| --- a/chrome/browser/host_content_settings_map.cc
|
| +++ b/chrome/browser/content_settings/host_content_settings_map.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/host_content_settings_map.h"
|
| +#include "chrome/browser/content_settings/host_content_settings_map.h"
|
|
|
| #include "base/command_line.h"
|
| #include "base/string_util.h"
|
| @@ -987,7 +987,7 @@ void HostContentSettingsMap::ReadDefaultSettings(bool overwrite) {
|
| ReadManagedDefaultSettings(prefs, &managed_default_content_settings_);
|
| }
|
|
|
| -void HostContentSettingsMap::ReadManagedDefaultSettings (
|
| +void HostContentSettingsMap::ReadManagedDefaultSettings(
|
| const PrefService* prefs, ContentSettings* settings) {
|
| for (size_t type = 0; type < arraysize(kPrefToManageType); ++type) {
|
| if (kPrefToManageType[type] == NULL) {
|
|
|