OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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_manager.h" | 7 #include "chrome/browser/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/dom_ui/new_tab_ui.h" | 11 #include "chrome/browser/dom_ui/new_tab_ui.h" |
12 #include "chrome/browser/download/download_manager.h" | 12 #include "chrome/browser/download/download_manager.h" |
13 #include "chrome/browser/external_protocol_handler.h" | 13 #include "chrome/browser/external_protocol_handler.h" |
14 #include "chrome/browser/google_url_tracker.h" | 14 #include "chrome/browser/google_url_tracker.h" |
15 #include "chrome/browser/metrics/metrics_service.h" | 15 #include "chrome/browser/metrics/metrics_service.h" |
16 #include "chrome/browser/net/dns_global.h" | 16 #include "chrome/browser/net/dns_global.h" |
17 #include "chrome/browser/password_manager/password_manager.h" | 17 #include "chrome/browser/password_manager/password_manager.h" |
18 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 18 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
19 #include "chrome/browser/renderer_host/web_cache_manager.h" | 19 #include "chrome/browser/renderer_host/web_cache_manager.h" |
20 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 20 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
21 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 21 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
22 #include "chrome/browser/session_startup_pref.h" | 22 #include "chrome/browser/session_startup_pref.h" |
23 #include "chrome/browser/ssl/ssl_manager.h" | 23 #include "chrome/browser/ssl/ssl_manager.h" |
24 #include "chrome/browser/tab_contents/tab_contents.h" | 24 #include "chrome/browser/tab_contents/tab_contents.h" |
25 | 25 |
26 #if defined(OS_WIN) // TODO(port): whittle this down as we port | 26 #if defined(OS_WIN) // TODO(port): whittle this down as we port |
27 #include "chrome/browser/task_manager.h" | 27 #include "chrome/browser/task_manager.h" |
| 28 #include "chrome/browser/views/blocked_popup_container.h" |
28 #include "chrome/browser/views/bookmark_manager_view.h" | 29 #include "chrome/browser/views/bookmark_manager_view.h" |
29 #include "chrome/browser/views/frame/browser_view.h" | 30 #include "chrome/browser/views/frame/browser_view.h" |
30 #include "chrome/browser/views/keyword_editor_view.h" | 31 #include "chrome/browser/views/keyword_editor_view.h" |
31 #include "chrome/browser/views/page_info_window.h" | 32 #include "chrome/browser/views/page_info_window.h" |
32 #endif | 33 #endif |
33 | 34 |
34 namespace browser { | 35 namespace browser { |
35 | 36 |
36 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { | 37 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { |
37 // Prefs in Local State | 38 // Prefs in Local State |
(...skipping 18 matching lines...) Expand all Loading... |
56 Browser::RegisterUserPrefs(user_prefs); | 57 Browser::RegisterUserPrefs(user_prefs); |
57 PasswordManager::RegisterUserPrefs(user_prefs); | 58 PasswordManager::RegisterUserPrefs(user_prefs); |
58 chrome_browser_net::RegisterUserPrefs(user_prefs); | 59 chrome_browser_net::RegisterUserPrefs(user_prefs); |
59 DownloadManager::RegisterUserPrefs(user_prefs); | 60 DownloadManager::RegisterUserPrefs(user_prefs); |
60 SSLManager::RegisterUserPrefs(user_prefs); | 61 SSLManager::RegisterUserPrefs(user_prefs); |
61 bookmark_utils::RegisterUserPrefs(user_prefs); | 62 bookmark_utils::RegisterUserPrefs(user_prefs); |
62 AutofillManager::RegisterUserPrefs(user_prefs); | 63 AutofillManager::RegisterUserPrefs(user_prefs); |
63 TabContents::RegisterUserPrefs(user_prefs); | 64 TabContents::RegisterUserPrefs(user_prefs); |
64 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 65 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
65 NewTabUI::RegisterUserPrefs(user_prefs); | 66 NewTabUI::RegisterUserPrefs(user_prefs); |
| 67 #if defined(OS_WIN) // TODO(port): whittle this down as we port |
| 68 BlockedPopupContainer::RegisterUserPrefs(user_prefs); |
| 69 #endif |
66 } | 70 } |
67 | 71 |
68 } // namespace browser | 72 } // namespace browser |
OLD | NEW |