chrome/browser/prefs/browser_prefs.cc - Issue 5367006: Refactor: move HostContentSettingsMap to content_settings

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 5367006: Refactor: move HostContentSettingsMap to content_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase again Created 10 years 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/plugin_exceptions_table_model.h ('k') | chrome/browser/profile_impl.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/prefs/browser_prefs.h"	5 #include "chrome/browser/prefs/browser_prefs.h"

6	6

7 #include "chrome/browser/about_flags.h"	7 #include "chrome/browser/about_flags.h"

8 #include "chrome/browser/autofill/autofill_manager.h"	8 #include "chrome/browser/autofill/autofill_manager.h"

9 #include "chrome/browser/background_contents_service.h"	9 #include "chrome/browser/background_contents_service.h"

10 #include "chrome/browser/background_mode_manager.h"	10 #include "chrome/browser/background_mode_manager.h"

11 #include "chrome/browser/background_page_tracker.h"	11 #include "chrome/browser/background_page_tracker.h"

12 #include "chrome/browser/bookmarks/bookmark_utils.h"	12 #include "chrome/browser/bookmarks/bookmark_utils.h"

13 #include "chrome/browser/browser_shutdown.h"	13 #include "chrome/browser/browser_shutdown.h"

	14 #include "chrome/browser/content_settings/host_content_settings_map.h"

14 #include "chrome/browser/debugger/devtools_manager.h"	15 #include "chrome/browser/debugger/devtools_manager.h"

15 #include "chrome/browser/dom_ui/flags_ui.h"	16 #include "chrome/browser/dom_ui/flags_ui.h"

16 #include "chrome/browser/dom_ui/new_tab_ui.h"	17 #include "chrome/browser/dom_ui/new_tab_ui.h"

17 #include "chrome/browser/dom_ui/plugins_ui.h"	18 #include "chrome/browser/dom_ui/plugins_ui.h"

18 #include "chrome/browser/download/download_prefs.h"	19 #include "chrome/browser/download/download_prefs.h"

19 #include "chrome/browser/extensions/extension_dom_ui.h"	20 #include "chrome/browser/extensions/extension_dom_ui.h"

20 #include "chrome/browser/extensions/extension_prefs.h"	21 #include "chrome/browser/extensions/extension_prefs.h"

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

22 #include "chrome/browser/external_protocol_handler.h"	23 #include "chrome/browser/external_protocol_handler.h"

23 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"	24 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"

24 #include "chrome/browser/geolocation/geolocation_prefs.h"	25 #include "chrome/browser/geolocation/geolocation_prefs.h"

25 #include "chrome/browser/google/google_url_tracker.h"	26 #include "chrome/browser/google/google_url_tracker.h"

26 #include "chrome/browser/host_content_settings_map.h"

27 #include "chrome/browser/host_zoom_map.h"	27 #include "chrome/browser/host_zoom_map.h"

28 #include "chrome/browser/intranet_redirect_detector.h"	28 #include "chrome/browser/intranet_redirect_detector.h"

29 #include "chrome/browser/instant/instant_controller.h"	29 #include "chrome/browser/instant/instant_controller.h"

30 #include "chrome/browser/metrics/metrics_log.h"	30 #include "chrome/browser/metrics/metrics_log.h"

31 #include "chrome/browser/metrics/metrics_service.h"	31 #include "chrome/browser/metrics/metrics_service.h"

32 #include "chrome/browser/net/chrome_url_request_context.h"	32 #include "chrome/browser/net/chrome_url_request_context.h"

33 #include "chrome/browser/net/predictor_api.h"	33 #include "chrome/browser/net/predictor_api.h"

34 #include "chrome/browser/net/net_pref_observer.h"	34 #include "chrome/browser/net/net_pref_observer.h"

35 #include "chrome/browser/notifications/desktop_notification_service.h"	35 #include "chrome/browser/notifications/desktop_notification_service.h"

36 #include "chrome/browser/page_info_model.h"	36 #include "chrome/browser/page_info_model.h"

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
145 chromeos::Preferences::RegisterUserPrefs(user_prefs);	145 chromeos::Preferences::RegisterUserPrefs(user_prefs);

146 #endif	146 #endif

147 BackgroundContentsService::RegisterUserPrefs(user_prefs);	147 BackgroundContentsService::RegisterUserPrefs(user_prefs);

148 SigninManager::RegisterUserPrefs(user_prefs);	148 SigninManager::RegisterUserPrefs(user_prefs);

149 TemplateURLModel::RegisterUserPrefs(user_prefs);	149 TemplateURLModel::RegisterUserPrefs(user_prefs);

150 InstantController::RegisterUserPrefs(user_prefs);	150 InstantController::RegisterUserPrefs(user_prefs);

151 NetPrefObserver::RegisterPrefs(user_prefs);	151 NetPrefObserver::RegisterPrefs(user_prefs);

152 }	152 }

153	153

154 } // namespace browser	154 } // namespace browser

OLD	NEW