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

Side by Side Diff: components/content_settings/core/browser/content_settings_pref_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_pref_provide r.h" 5 #include "components/content_settings/core/browser/content_settings_pref_provide r.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/auto_reset.h" 13 #include "base/auto_reset.h"
14 #include "base/bind.h" 14 #include "base/bind.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/prefs/pref_registry.h"
18 #include "base/prefs/pref_service.h"
19 #include "base/prefs/scoped_user_pref_update.h"
17 #include "base/strings/string_split.h" 20 #include "base/strings/string_split.h"
18 #include "base/time/clock.h" 21 #include "base/time/clock.h"
19 #include "base/time/default_clock.h" 22 #include "base/time/default_clock.h"
20 #include "components/content_settings/core/browser/content_settings_pref.h" 23 #include "components/content_settings/core/browser/content_settings_pref.h"
21 #include "components/content_settings/core/browser/content_settings_rule.h" 24 #include "components/content_settings/core/browser/content_settings_rule.h"
22 #include "components/content_settings/core/browser/content_settings_utils.h" 25 #include "components/content_settings/core/browser/content_settings_utils.h"
23 #include "components/content_settings/core/browser/host_content_settings_map.h" 26 #include "components/content_settings/core/browser/host_content_settings_map.h"
24 #include "components/content_settings/core/browser/website_settings_info.h" 27 #include "components/content_settings/core/browser/website_settings_info.h"
25 #include "components/content_settings/core/browser/website_settings_registry.h" 28 #include "components/content_settings/core/browser/website_settings_registry.h"
26 #include "components/content_settings/core/common/content_settings.h" 29 #include "components/content_settings/core/common/content_settings.h"
27 #include "components/content_settings/core/common/content_settings_pattern.h" 30 #include "components/content_settings/core/common/content_settings_pattern.h"
28 #include "components/content_settings/core/common/pref_names.h" 31 #include "components/content_settings/core/common/pref_names.h"
29 #include "components/pref_registry/pref_registry_syncable.h" 32 #include "components/pref_registry/pref_registry_syncable.h"
30 #include "components/prefs/pref_registry.h"
31 #include "components/prefs/pref_service.h"
32 #include "components/prefs/scoped_user_pref_update.h"
33 33
34 namespace { 34 namespace {
35 35
36 // Obsolete prefs. 36 // Obsolete prefs.
37 // TODO(msramek): Remove the cleanup code after two releases (i.e. in M50). 37 // TODO(msramek): Remove the cleanup code after two releases (i.e. in M50).
38 const char kObsoleteMetroSwitchToDesktopExceptions[] = 38 const char kObsoleteMetroSwitchToDesktopExceptions[] =
39 "profile.content_settings.exceptions.metro_switch_to_desktop"; 39 "profile.content_settings.exceptions.metro_switch_to_desktop";
40 40
41 const char kObsoleteMediaStreamExceptions[] = 41 const char kObsoleteMediaStreamExceptions[] =
42 "profile.content_settings.exceptions.media_stream"; 42 "profile.content_settings.exceptions.media_stream";
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 content_type, 208 content_type,
209 resource_identifier); 209 resource_identifier);
210 } 210 }
211 211
212 void PrefProvider::DiscardObsoletePreferences() { 212 void PrefProvider::DiscardObsoletePreferences() {
213 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopExceptions); 213 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopExceptions);
214 prefs_->ClearPref(kObsoleteMediaStreamExceptions); 214 prefs_->ClearPref(kObsoleteMediaStreamExceptions);
215 } 215 }
216 216
217 } // namespace content_settings 217 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698