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/browser_prefs.h" | 5 #include "chrome/browser/browser_prefs.h" |
6 | 6 |
7 #include "chrome/browser/autofill/autofill_manager.h" | 7 #include "chrome/browser/autofill/autofill_manager.h" |
8 #include "chrome/browser/bookmarks/bookmark_utils.h" | 8 #include "chrome/browser/bookmarks/bookmark_utils.h" |
9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
10 #include "chrome/browser/browser_shutdown.h" | 10 #include "chrome/browser/browser_shutdown.h" |
11 #include "chrome/browser/cookie_modal_dialog.h" | 11 #include "chrome/browser/cookie_modal_dialog.h" |
12 #include "chrome/browser/debugger/devtools_manager.h" | 12 #include "chrome/browser/debugger/devtools_manager.h" |
13 #include "chrome/browser/dom_ui/new_tab_ui.h" | 13 #include "chrome/browser/dom_ui/new_tab_ui.h" |
14 #include "chrome/browser/download/download_manager.h" | 14 #include "chrome/browser/download/download_manager.h" |
15 #include "chrome/browser/extensions/extension_dom_ui.h" | 15 #include "chrome/browser/extensions/extension_dom_ui.h" |
16 #include "chrome/browser/extensions/extension_prefs.h" | 16 #include "chrome/browser/extensions/extension_prefs.h" |
17 #include "chrome/browser/extensions/extensions_ui.h" | 17 #include "chrome/browser/extensions/extensions_ui.h" |
18 #include "chrome/browser/external_protocol_handler.h" | 18 #include "chrome/browser/external_protocol_handler.h" |
| 19 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
19 #include "chrome/browser/geolocation/geolocation_prefs.h" | 20 #include "chrome/browser/geolocation/geolocation_prefs.h" |
20 #include "chrome/browser/google_url_tracker.h" | 21 #include "chrome/browser/google_url_tracker.h" |
21 #include "chrome/browser/host_content_settings_map.h" | 22 #include "chrome/browser/host_content_settings_map.h" |
22 #include "chrome/browser/host_zoom_map.h" | 23 #include "chrome/browser/host_zoom_map.h" |
23 #include "chrome/browser/intranet_redirect_detector.h" | 24 #include "chrome/browser/intranet_redirect_detector.h" |
24 #include "chrome/browser/metrics/metrics_service.h" | 25 #include "chrome/browser/metrics/metrics_service.h" |
25 #include "chrome/browser/net/dns_global.h" | 26 #include "chrome/browser/net/dns_global.h" |
26 #include "chrome/browser/page_info_model.h" | 27 #include "chrome/browser/page_info_model.h" |
27 #include "chrome/browser/password_manager/password_manager.h" | 28 #include "chrome/browser/password_manager/password_manager.h" |
28 #include "chrome/browser/privacy_blacklist/blacklist.h" | 29 #include "chrome/browser/privacy_blacklist/blacklist.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 96 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
96 ExtensionDOMUI::RegisterUserPrefs(user_prefs); | 97 ExtensionDOMUI::RegisterUserPrefs(user_prefs); |
97 ExtensionsUI::RegisterUserPrefs(user_prefs); | 98 ExtensionsUI::RegisterUserPrefs(user_prefs); |
98 NewTabUI::RegisterUserPrefs(user_prefs); | 99 NewTabUI::RegisterUserPrefs(user_prefs); |
99 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 100 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
100 HostZoomMap::RegisterUserPrefs(user_prefs); | 101 HostZoomMap::RegisterUserPrefs(user_prefs); |
101 DevToolsManager::RegisterUserPrefs(user_prefs); | 102 DevToolsManager::RegisterUserPrefs(user_prefs); |
102 Blacklist::RegisterUserPrefs(user_prefs); | 103 Blacklist::RegisterUserPrefs(user_prefs); |
103 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 104 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
104 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 105 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 106 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); |
105 #if defined(TOOLKIT_VIEWS) | 107 #if defined(TOOLKIT_VIEWS) |
106 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 108 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
107 #elif defined(TOOLKIT_GTK) | 109 #elif defined(TOOLKIT_GTK) |
108 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 110 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
109 #endif | 111 #endif |
110 #if defined(OS_CHROMEOS) | 112 #if defined(OS_CHROMEOS) |
111 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 113 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
112 #endif | 114 #endif |
113 } | 115 } |
114 | 116 |
115 } // namespace browser | 117 } // namespace browser |
OLD | NEW |