components/content_settings/core/browser/content_settings_default_provider.cc - Issue 1662843002: Revert of Delete base/prefs and update callers to use components.

Side by Side Diff: components/content_settings/core/browser/content_settings_default_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

« no previous file with comments | « components/content_settings/core/browser/content_settings_default_provider.h ('k') | components/content_settings/core/browser/content_settings_policy_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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_default_prov ider.h"	5 #include "components/content_settings/core/browser/content_settings_default_prov ider.h"

6	6

7 #include <string>	7 #include <string>

8 #include <vector>	8 #include <vector>

9	9

10 #include "base/auto_reset.h"	10 #include "base/auto_reset.h"

11 #include "base/bind.h"	11 #include "base/bind.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/metrics/histogram_macros.h"	13 #include "base/metrics/histogram_macros.h"

	14 #include "base/prefs/pref_registry.h"

	15 #include "base/prefs/pref_service.h"

	16 #include "base/prefs/scoped_user_pref_update.h"

14 #include "components/content_settings/core/browser/content_settings_rule.h"	17 #include "components/content_settings/core/browser/content_settings_rule.h"

15 #include "components/content_settings/core/browser/content_settings_utils.h"	18 #include "components/content_settings/core/browser/content_settings_utils.h"

16 #include "components/content_settings/core/browser/website_settings_info.h"	19 #include "components/content_settings/core/browser/website_settings_info.h"

17 #include "components/content_settings/core/browser/website_settings_registry.h"	20 #include "components/content_settings/core/browser/website_settings_registry.h"

18 #include "components/content_settings/core/common/content_settings.h"	21 #include "components/content_settings/core/common/content_settings.h"

19 #include "components/content_settings/core/common/content_settings_pattern.h"	22 #include "components/content_settings/core/common/content_settings_pattern.h"

20 #include "components/content_settings/core/common/pref_names.h"	23 #include "components/content_settings/core/common/pref_names.h"

21 #include "components/pref_registry/pref_registry_syncable.h"	24 #include "components/pref_registry/pref_registry_syncable.h"

22 #include "components/prefs/pref_registry.h"

23 #include "components/prefs/pref_service.h"

24 #include "components/prefs/scoped_user_pref_update.h"

25 #include "url/gurl.h"	25 #include "url/gurl.h"

26	26

27 namespace content_settings {	27 namespace content_settings {

28	28

29 namespace {	29 namespace {

30	30

31 // Obsolete prefs to be removed from the pref file.	31 // Obsolete prefs to be removed from the pref file.

32 // TODO(msramek): Remove this cleanup code after two releases (i.e. in M50).	32 // TODO(msramek): Remove this cleanup code after two releases (i.e. in M50).

33 const char kObsoleteMetroSwitchToDesktopSetting[] =	33 const char kObsoleteMetroSwitchToDesktopSetting[] =

34 "profile.default_content_setting_values.metro_switch_to_desktop";	34 "profile.default_content_setting_values.metro_switch_to_desktop";

(...skipping 319 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
354 int int_value = prefs_->GetInteger(GetPrefName(content_type));	354 int int_value = prefs_->GetInteger(GetPrefName(content_type));

355 return ContentSettingToValue(IntToContentSetting(int_value));	355 return ContentSettingToValue(IntToContentSetting(int_value));

356 }	356 }

357	357

358 void DefaultProvider::DiscardObsoletePreferences() {	358 void DefaultProvider::DiscardObsoletePreferences() {

359 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);	359 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting);

360 prefs_->ClearPref(kObsoleteMediaStreamSetting);	360 prefs_->ClearPref(kObsoleteMediaStreamSetting);

361 }	361 }

362	362

363 } // namespace content_settings	363 } // namespace content_settings

OLD	NEW