chrome/browser/content_settings/host_content_settings_map.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. Created 7 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/content_settings/cookie_settings_unittest.cc ('k') | chrome/browser/content_settings/host_content_settings_map_unittest.cc » ('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 "chrome/browser/content_settings/host_content_settings_map.h"	5 #include "chrome/browser/content_settings/host_content_settings_map.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

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

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

11 #include "base/stl_util.h"	12 #include "base/stl_util.h"

12 #include "base/string_util.h"	13 #include "base/string_util.h"

13 #include "base/utf_string_conversions.h"	14 #include "base/utf_string_conversions.h"

14 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h"	15 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h"

15 #include "chrome/browser/content_settings/content_settings_default_provider.h"	16 #include "chrome/browser/content_settings/content_settings_default_provider.h"

16 #include "chrome/browser/content_settings/content_settings_details.h"	17 #include "chrome/browser/content_settings/content_settings_details.h"

17 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"	18 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"

18 #include "chrome/browser/content_settings/content_settings_observable_provider.h "	19 #include "chrome/browser/content_settings/content_settings_observable_provider.h "

19 #include "chrome/browser/content_settings/content_settings_policy_provider.h"	20 #include "chrome/browser/content_settings/content_settings_policy_provider.h"

20 #include "chrome/browser/content_settings/content_settings_pref_provider.h"	21 #include "chrome/browser/content_settings/content_settings_pref_provider.h"

21 #include "chrome/browser/content_settings/content_settings_provider.h"	22 #include "chrome/browser/content_settings/content_settings_provider.h"

22 #include "chrome/browser/content_settings/content_settings_rule.h"	23 #include "chrome/browser/content_settings/content_settings_rule.h"

23 #include "chrome/browser/content_settings/content_settings_utils.h"	24 #include "chrome/browser/content_settings/content_settings_utils.h"

24 #include "chrome/browser/extensions/extension_service.h"	25 #include "chrome/browser/extensions/extension_service.h"

25 #include "chrome/browser/intents/web_intents_util.h"	26 #include "chrome/browser/intents/web_intents_util.h"

26 #include "chrome/browser/prefs/pref_registry_syncable.h"	27 #include "chrome/browser/prefs/pref_registry_syncable.h"

27 #include "chrome/browser/prefs/pref_service.h"

28 #include "chrome/common/chrome_notification_types.h"	28 #include "chrome/common/chrome_notification_types.h"

29 #include "chrome/common/chrome_switches.h"	29 #include "chrome/common/chrome_switches.h"

30 #include "chrome/common/content_settings_pattern.h"	30 #include "chrome/common/content_settings_pattern.h"

31 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

32 #include "chrome/common/url_constants.h"	32 #include "chrome/common/url_constants.h"

33 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

34 #include "content/public/browser/notification_service.h"	34 #include "content/public/browser/notification_service.h"

35 #include "content/public/browser/notification_source.h"	35 #include "content/public/browser/notification_source.h"

36 #include "content/public/browser/user_metrics.h"	36 #include "content/public/browser/user_metrics.h"

37 #include "content/public/common/content_switches.h"	37 #include "content/public/common/content_switches.h"

(...skipping 545 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
583 HostContentSettingsMap::GetProviderTypeFromSource(	583 HostContentSettingsMap::GetProviderTypeFromSource(

584 const std::string& source) {	584 const std::string& source) {

585 for (size_t i = 0; i < arraysize(kProviderNames); ++i) {	585 for (size_t i = 0; i < arraysize(kProviderNames); ++i) {

586 if (source == kProviderNames[i])	586 if (source == kProviderNames[i])

587 return static_cast<ProviderType>(i);	587 return static_cast<ProviderType>(i);

588 }	588 }

589	589

590 NOTREACHED();	590 NOTREACHED();

591 return DEFAULT_PROVIDER;	591 return DEFAULT_PROVIDER;

592 }	592 }

OLD	NEW