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

Side by Side Diff: chrome/browser/content_settings/content_settings_policy_provider.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_policy_provider.h" 5 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/content_settings/content_settings_rule.h"
14 #include "chrome/browser/content_settings/content_settings_utils.h" 13 #include "chrome/browser/content_settings/content_settings_utils.h"
15 #include "chrome/common/pref_names.h" 14 #include "chrome/common/pref_names.h"
15 #include "components/content_settings/core/browser/content_settings_rule.h"
16 #include "components/content_settings/core/common/content_settings_pattern.h" 16 #include "components/content_settings/core/common/content_settings_pattern.h"
17 #include "components/pref_registry/pref_registry_syncable.h" 17 #include "components/pref_registry/pref_registry_syncable.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 19
20 using content::BrowserThread; 20 using content::BrowserThread;
21 21
22 namespace { 22 namespace {
23 23
24 // The preferences used to manage ContentSettingsTypes. 24 // The preferences used to manage ContentSettingsTypes.
25 const char* kPrefToManageType[] = { 25 const char* kPrefToManageType[] = {
(...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 ReadManagedDefaultSettings(); 488 ReadManagedDefaultSettings();
489 } 489 }
490 490
491 NotifyObservers(ContentSettingsPattern(), 491 NotifyObservers(ContentSettingsPattern(),
492 ContentSettingsPattern(), 492 ContentSettingsPattern(),
493 CONTENT_SETTINGS_TYPE_DEFAULT, 493 CONTENT_SETTINGS_TYPE_DEFAULT,
494 std::string()); 494 std::string());
495 } 495 }
496 496
497 } // namespace content_settings 497 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698