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

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

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 "components/content_settings/core/browser/content_settings_policy_provi der.h" 5 #include "components/content_settings/core/browser/content_settings_policy_provi der.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/prefs/pref_service.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "components/content_settings/core/browser/content_settings_rule.h" 16 #include "components/content_settings/core/browser/content_settings_rule.h"
16 #include "components/content_settings/core/browser/content_settings_utils.h" 17 #include "components/content_settings/core/browser/content_settings_utils.h"
17 #include "components/content_settings/core/common/content_settings_pattern.h" 18 #include "components/content_settings/core/common/content_settings_pattern.h"
18 #include "components/content_settings/core/common/pref_names.h" 19 #include "components/content_settings/core/common/pref_names.h"
19 #include "components/pref_registry/pref_registry_syncable.h" 20 #include "components/pref_registry/pref_registry_syncable.h"
20 #include "components/prefs/pref_service.h"
21 21
22 namespace { 22 namespace {
23 23
24 struct PrefsForManagedContentSettingsMapEntry { 24 struct PrefsForManagedContentSettingsMapEntry {
25 const char* pref_name; 25 const char* pref_name;
26 ContentSettingsType content_type; 26 ContentSettingsType content_type;
27 ContentSetting setting; 27 ContentSetting setting;
28 }; 28 };
29 29
30 const PrefsForManagedContentSettingsMapEntry 30 const PrefsForManagedContentSettingsMapEntry
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 ReadManagedDefaultSettings(); 415 ReadManagedDefaultSettings();
416 } 416 }
417 417
418 NotifyObservers(ContentSettingsPattern(), 418 NotifyObservers(ContentSettingsPattern(),
419 ContentSettingsPattern(), 419 ContentSettingsPattern(),
420 CONTENT_SETTINGS_TYPE_DEFAULT, 420 CONTENT_SETTINGS_TYPE_DEFAULT,
421 std::string()); 421 std::string());
422 } 422 }
423 423
424 } // namespace content_settings 424 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698