| 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/browser.h" | 9 #include "chrome/browser/browser.h" |
| 9 #include "chrome/browser/browser_shutdown.h" | 10 #include "chrome/browser/browser_shutdown.h" |
| 10 #include "chrome/browser/cache_manager_host.h" | 11 #include "chrome/browser/cache_manager_host.h" |
| 11 #include "chrome/browser/download/download_manager.h" | 12 #include "chrome/browser/download/download_manager.h" |
| 12 #include "chrome/browser/external_protocol_handler.h" | 13 #include "chrome/browser/external_protocol_handler.h" |
| 13 #include "chrome/browser/google_url_tracker.h" | 14 #include "chrome/browser/google_url_tracker.h" |
| 14 #include "chrome/browser/metrics/metrics_service.h" | 15 #include "chrome/browser/metrics/metrics_service.h" |
| 15 #include "chrome/browser/net/dns_global.h" | 16 #include "chrome/browser/net/dns_global.h" |
| 16 #include "chrome/browser/password_manager/password_manager.h" | 17 #include "chrome/browser/password_manager/password_manager.h" |
| 17 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 18 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
| 18 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 19 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 19 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 20 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 20 #include "chrome/browser/session_startup_pref.h" | 21 #include "chrome/browser/session_startup_pref.h" |
| 21 #include "chrome/browser/ssl/ssl_manager.h" | 22 #include "chrome/browser/ssl/ssl_manager.h" |
| 22 #include "chrome/browser/tab_contents/web_contents.h" | 23 #include "chrome/browser/tab_contents/web_contents.h" |
| 23 | 24 |
| 24 #if defined(OS_WIN) // TODO(port): whittle this down as we port | 25 #if defined(OS_WIN) // TODO(port): whittle this down as we port |
| 25 #include "chrome/browser/task_manager.h" | 26 #include "chrome/browser/task_manager.h" |
| 26 #include "chrome/browser/views/bookmark_bar_view.h" | |
| 27 #include "chrome/browser/views/bookmark_manager_view.h" | 27 #include "chrome/browser/views/bookmark_manager_view.h" |
| 28 #include "chrome/browser/views/bookmark_table_view.h" | |
| 29 #include "chrome/browser/views/frame/browser_view.h" | 28 #include "chrome/browser/views/frame/browser_view.h" |
| 30 #include "chrome/browser/views/keyword_editor_view.h" | 29 #include "chrome/browser/views/keyword_editor_view.h" |
| 31 #include "chrome/browser/views/page_info_window.h" | 30 #include "chrome/browser/views/page_info_window.h" |
| 32 #endif | 31 #endif |
| 33 | 32 |
| 34 namespace browser { | 33 namespace browser { |
| 35 | 34 |
| 36 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { | 35 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state) { |
| 37 // Prefs in Local State | 36 // Prefs in Local State |
| 38 Browser::RegisterPrefs(local_state); | 37 Browser::RegisterPrefs(local_state); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 51 TaskManager::RegisterPrefs(local_state); | 50 TaskManager::RegisterPrefs(local_state); |
| 52 #endif | 51 #endif |
| 53 | 52 |
| 54 // User prefs | 53 // User prefs |
| 55 SessionStartupPref::RegisterUserPrefs(user_prefs); | 54 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 56 Browser::RegisterUserPrefs(user_prefs); | 55 Browser::RegisterUserPrefs(user_prefs); |
| 57 PasswordManager::RegisterUserPrefs(user_prefs); | 56 PasswordManager::RegisterUserPrefs(user_prefs); |
| 58 chrome_browser_net::RegisterUserPrefs(user_prefs); | 57 chrome_browser_net::RegisterUserPrefs(user_prefs); |
| 59 DownloadManager::RegisterUserPrefs(user_prefs); | 58 DownloadManager::RegisterUserPrefs(user_prefs); |
| 60 SSLManager::RegisterUserPrefs(user_prefs); | 59 SSLManager::RegisterUserPrefs(user_prefs); |
| 61 #if defined(OS_WIN) // TODO(port): whittle this down as we port | 60 bookmark_utils::RegisterUserPrefs(user_prefs); |
| 62 BookmarkBarView::RegisterUserPrefs(user_prefs); | |
| 63 BookmarkTableView::RegisterUserPrefs(user_prefs); | |
| 64 #endif | |
| 65 AutofillManager::RegisterUserPrefs(user_prefs); | 61 AutofillManager::RegisterUserPrefs(user_prefs); |
| 66 TabContents::RegisterUserPrefs(user_prefs); | 62 TabContents::RegisterUserPrefs(user_prefs); |
| 67 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 63 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
| 68 WebContents::RegisterUserPrefs(user_prefs); | 64 WebContents::RegisterUserPrefs(user_prefs); |
| 69 } | 65 } |
| 70 | 66 |
| 71 } // namespace browser | 67 } // namespace browser |
| OLD | NEW |