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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_api.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/extensions/api/browsing_data/browsing_data_test.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.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/extensions/api/content_settings/content_settings_api.h"	5 #include "chrome/browser/extensions/api/content_settings/content_settings_api.h"

6	6

7 #include <set>	7 #include <set>

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

9	9

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

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

12 #include "base/memory/scoped_ptr.h"	12 #include "base/memory/scoped_ptr.h"

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

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

14 #include "chrome/browser/content_settings/cookie_settings.h"	15 #include "chrome/browser/content_settings/cookie_settings.h"

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

16 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h"	17 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h"

17 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h"	18 #include "chrome/browser/extensions/api/content_settings/content_settings_helper s.h"

18 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"	19 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"

19 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"	20 #include "chrome/browser/extensions/api/preference/preference_api_constants.h"

20 #include "chrome/browser/extensions/api/preference/preference_helpers.h"	21 #include "chrome/browser/extensions/api/preference/preference_helpers.h"

21 #include "chrome/browser/extensions/extension_service.h"	22 #include "chrome/browser/extensions/extension_service.h"

22 #include "chrome/browser/extensions/extension_system.h"	23 #include "chrome/browser/extensions/extension_system.h"

23 #include "chrome/browser/plugins/plugin_finder.h"	24 #include "chrome/browser/plugins/plugin_finder.h"

24 #include "chrome/browser/plugins/plugin_installer.h"	25 #include "chrome/browser/plugins/plugin_installer.h"

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

26 #include "chrome/browser/profiles/profile.h"	26 #include "chrome/browser/profiles/profile.h"

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

28 #include "chrome/common/extensions/api/content_settings.h"	28 #include "chrome/common/extensions/api/content_settings.h"

29 #include "content/public/browser/plugin_service.h"	29 #include "content/public/browser/plugin_service.h"

30 #include "extensions/common/error_utils.h"	30 #include "extensions/common/error_utils.h"

31	31

32 using content::BrowserThread;	32 using content::BrowserThread;

33 using content::PluginService;	33 using content::PluginService;

34	34

35 namespace Clear = extensions::api::content_settings::ContentSetting::Clear;	35 namespace Clear = extensions::api::content_settings::ContentSetting::Clear;

(...skipping 259 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
295 true));	295 true));

296 }	296 }

297	297

298 // static	298 // static

299 void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(	299 void ContentSettingsGetResourceIdentifiersFunction::SetPluginsForTesting(

300 const std::vector<webkit::WebPluginInfo>* plugins) {	300 const std::vector<webkit::WebPluginInfo>* plugins) {

301 g_testing_plugins_ = plugins;	301 g_testing_plugins_ = plugins;

302 }	302 }

303	303

304 } // namespace extensions	304 } // namespace extensions

OLD	NEW