| 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/dom_ui/plugins_ui.h" | 14 #include "chrome/browser/dom_ui/plugins_ui.h" |
| 15 #include "chrome/browser/download/download_manager.h" | 15 #include "chrome/browser/download/download_manager.h" |
| 16 #include "chrome/browser/extensions/extension_dom_ui.h" | 16 #include "chrome/browser/extensions/extension_dom_ui.h" |
| 17 #include "chrome/browser/extensions/extension_prefs.h" | 17 #include "chrome/browser/extensions/extension_prefs.h" |
| 18 #include "chrome/browser/extensions/extensions_ui.h" | 18 #include "chrome/browser/extensions/extensions_ui.h" |
| 19 #include "chrome/browser/external_protocol_handler.h" | 19 #include "chrome/browser/external_protocol_handler.h" |
| 20 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" | 20 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" |
| 21 #include "chrome/browser/geolocation/geolocation_prefs.h" | 21 #include "chrome/browser/geolocation/geolocation_prefs.h" |
| 22 #include "chrome/browser/google_url_tracker.h" | 22 #include "chrome/browser/google_url_tracker.h" |
| 23 #include "chrome/browser/gtk/certificate_manager.h" |
| 23 #include "chrome/browser/host_content_settings_map.h" | 24 #include "chrome/browser/host_content_settings_map.h" |
| 24 #include "chrome/browser/host_zoom_map.h" | 25 #include "chrome/browser/host_zoom_map.h" |
| 25 #include "chrome/browser/intranet_redirect_detector.h" | 26 #include "chrome/browser/intranet_redirect_detector.h" |
| 26 #include "chrome/browser/metrics/metrics_service.h" | 27 #include "chrome/browser/metrics/metrics_service.h" |
| 27 #include "chrome/browser/net/dns_global.h" | 28 #include "chrome/browser/net/dns_global.h" |
| 28 #include "chrome/browser/notifications/desktop_notification_service.h" | 29 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 29 #include "chrome/browser/page_info_model.h" | 30 #include "chrome/browser/page_info_model.h" |
| 30 #include "chrome/browser/password_manager/password_manager.h" | 31 #include "chrome/browser/password_manager/password_manager.h" |
| 31 #include "chrome/browser/privacy_blacklist/blacklist.h" | 32 #include "chrome/browser/privacy_blacklist/blacklist.h" |
| 32 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 33 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 Blacklist::RegisterUserPrefs(user_prefs); | 112 Blacklist::RegisterUserPrefs(user_prefs); |
| 112 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 113 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
| 113 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 114 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
| 114 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); | 115 GeolocationContentSettingsMap::RegisterUserPrefs(user_prefs); |
| 115 TranslatePrefs::RegisterUserPrefs(user_prefs); | 116 TranslatePrefs::RegisterUserPrefs(user_prefs); |
| 116 DesktopNotificationService::RegisterUserPrefs(user_prefs); | 117 DesktopNotificationService::RegisterUserPrefs(user_prefs); |
| 117 #if defined(TOOLKIT_VIEWS) | 118 #if defined(TOOLKIT_VIEWS) |
| 118 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 119 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
| 119 #elif defined(TOOLKIT_GTK) | 120 #elif defined(TOOLKIT_GTK) |
| 120 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 121 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 122 certificate_manager_util::RegisterUserPrefs(user_prefs); |
| 121 #endif | 123 #endif |
| 122 #if defined(OS_CHROMEOS) | 124 #if defined(OS_CHROMEOS) |
| 123 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 125 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 124 #endif | 126 #endif |
| 125 } | 127 } |
| 126 | 128 |
| 127 } // namespace browser | 129 } // namespace browser |
| OLD | NEW |