OLD | NEW |
1 // Copyright (c) 2009 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/bookmarks/bookmark_utils.h" | 7 #include "chrome/browser/bookmarks/bookmark_utils.h" |
8 #include "chrome/browser/blocked_popup_container.h" | 8 #include "chrome/browser/blocked_popup_container.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/debugger/devtools_manager.h" | 11 #include "chrome/browser/debugger/devtools_manager.h" |
12 #include "chrome/browser/dom_ui/new_tab_ui.h" | 12 #include "chrome/browser/dom_ui/new_tab_ui.h" |
13 #include "chrome/browser/download/download_manager.h" | 13 #include "chrome/browser/download/download_manager.h" |
14 #include "chrome/browser/extensions/extension_dom_ui.h" | 14 #include "chrome/browser/extensions/extension_dom_ui.h" |
15 #include "chrome/browser/extensions/extensions_ui.h" | 15 #include "chrome/browser/extensions/extensions_ui.h" |
16 #include "chrome/browser/external_protocol_handler.h" | 16 #include "chrome/browser/external_protocol_handler.h" |
17 #include "chrome/browser/form_field_history_manager.h" | 17 #include "chrome/browser/form_field_history_manager.h" |
18 #include "chrome/browser/google_url_tracker.h" | 18 #include "chrome/browser/google_url_tracker.h" |
19 #include "chrome/browser/host_zoom_map.h" | 19 #include "chrome/browser/host_zoom_map.h" |
| 20 #include "chrome/browser/intranet_redirect_detector.h" |
20 #include "chrome/browser/metrics/metrics_service.h" | 21 #include "chrome/browser/metrics/metrics_service.h" |
21 #include "chrome/browser/net/dns_global.h" | 22 #include "chrome/browser/net/dns_global.h" |
22 #include "chrome/browser/page_info_model.h" | 23 #include "chrome/browser/page_info_model.h" |
23 #include "chrome/browser/password_manager/password_manager.h" | 24 #include "chrome/browser/password_manager/password_manager.h" |
24 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 25 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
25 #include "chrome/browser/renderer_host/web_cache_manager.h" | 26 #include "chrome/browser/renderer_host/web_cache_manager.h" |
26 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
27 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 28 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
28 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 29 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
29 #include "chrome/browser/session_startup_pref.h" | 30 #include "chrome/browser/session_startup_pref.h" |
(...skipping 26 matching lines...) Expand all Loading... |
56 RegisterLocalState(local_state); | 57 RegisterLocalState(local_state); |
57 RegisterUserPrefs(user_prefs); | 58 RegisterUserPrefs(user_prefs); |
58 } | 59 } |
59 | 60 |
60 void RegisterLocalState(PrefService* local_state) { | 61 void RegisterLocalState(PrefService* local_state) { |
61 // Prefs in Local State | 62 // Prefs in Local State |
62 Browser::RegisterPrefs(local_state); | 63 Browser::RegisterPrefs(local_state); |
63 WebCacheManager::RegisterPrefs(local_state); | 64 WebCacheManager::RegisterPrefs(local_state); |
64 ExternalProtocolHandler::RegisterPrefs(local_state); | 65 ExternalProtocolHandler::RegisterPrefs(local_state); |
65 GoogleURLTracker::RegisterPrefs(local_state); | 66 GoogleURLTracker::RegisterPrefs(local_state); |
| 67 IntranetRedirectDetector::RegisterPrefs(local_state); |
66 KeywordEditorController::RegisterPrefs(local_state); | 68 KeywordEditorController::RegisterPrefs(local_state); |
67 MetricsLog::RegisterPrefs(local_state); | 69 MetricsLog::RegisterPrefs(local_state); |
68 MetricsService::RegisterPrefs(local_state); | 70 MetricsService::RegisterPrefs(local_state); |
69 SafeBrowsingService::RegisterPrefs(local_state); | 71 SafeBrowsingService::RegisterPrefs(local_state); |
70 browser_shutdown::RegisterPrefs(local_state); | 72 browser_shutdown::RegisterPrefs(local_state); |
71 chrome_browser_net::RegisterPrefs(local_state); | 73 chrome_browser_net::RegisterPrefs(local_state); |
72 bookmark_utils::RegisterPrefs(local_state); | 74 bookmark_utils::RegisterPrefs(local_state); |
73 PageInfoModel::RegisterPrefs(local_state); | 75 PageInfoModel::RegisterPrefs(local_state); |
74 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 76 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
75 BrowserView::RegisterBrowserViewPrefs(local_state); | 77 BrowserView::RegisterBrowserViewPrefs(local_state); |
(...skipping 23 matching lines...) Expand all Loading... |
99 DevToolsManager::RegisterUserPrefs(user_prefs); | 101 DevToolsManager::RegisterUserPrefs(user_prefs); |
100 #if defined(TOOLKIT_GTK) | 102 #if defined(TOOLKIT_GTK) |
101 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 103 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
102 #endif | 104 #endif |
103 #if defined(OS_CHROMEOS) | 105 #if defined(OS_CHROMEOS) |
104 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 106 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
105 #endif | 107 #endif |
106 } | 108 } |
107 | 109 |
108 } // namespace browser | 110 } // namespace browser |
OLD | NEW |