| 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/blocked_popup_container.h" | 9 #include "chrome/browser/blocked_popup_container.h" |
| 10 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/page_info_model.h" | 24 #include "chrome/browser/page_info_model.h" |
| 25 #include "chrome/browser/password_manager/password_manager.h" | 25 #include "chrome/browser/password_manager/password_manager.h" |
| 26 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 26 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
| 27 #include "chrome/browser/renderer_host/web_cache_manager.h" | 27 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 28 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 28 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 29 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 29 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
| 30 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 30 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 31 #include "chrome/browser/session_startup_pref.h" | 31 #include "chrome/browser/session_startup_pref.h" |
| 32 #include "chrome/browser/ssl/ssl_manager.h" | 32 #include "chrome/browser/ssl/ssl_manager.h" |
| 33 #include "chrome/browser/tab_contents/tab_contents.h" | 33 #include "chrome/browser/tab_contents/tab_contents.h" |
| 34 #include "chrome/browser/task_manager.h" |
| 34 | 35 |
| 35 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 36 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 36 #include "chrome/browser/views/frame/browser_view.h" | 37 #include "chrome/browser/views/frame/browser_view.h" |
| 37 #endif | 38 #endif |
| 38 | 39 |
| 39 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 40 #include "chrome/browser/task_manager.h" | |
| 41 #endif | |
| 42 | |
| 43 #if defined(OS_WIN) | |
| 44 #include "chrome/browser/views/keyword_editor_view.h" | |
| 45 #endif | |
| 46 | |
| 47 #if defined(TOOLKIT_GTK) | 40 #if defined(TOOLKIT_GTK) |
| 48 #include "chrome/browser/gtk/browser_window_gtk.h" | 41 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 49 #endif | 42 #endif |
| 50 | 43 |
| 51 #if defined(OS_CHROMEOS) | 44 #if defined(OS_CHROMEOS) |
| 52 #include "chrome/browser/chromeos/preferences.h" | 45 #include "chrome/browser/chromeos/preferences.h" |
| 53 #endif | 46 #endif |
| 54 | 47 |
| 55 namespace browser { | 48 namespace browser { |
| 56 | 49 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 70 MetricsLog::RegisterPrefs(local_state); | 63 MetricsLog::RegisterPrefs(local_state); |
| 71 MetricsService::RegisterPrefs(local_state); | 64 MetricsService::RegisterPrefs(local_state); |
| 72 SafeBrowsingService::RegisterPrefs(local_state); | 65 SafeBrowsingService::RegisterPrefs(local_state); |
| 73 browser_shutdown::RegisterPrefs(local_state); | 66 browser_shutdown::RegisterPrefs(local_state); |
| 74 chrome_browser_net::RegisterPrefs(local_state); | 67 chrome_browser_net::RegisterPrefs(local_state); |
| 75 bookmark_utils::RegisterPrefs(local_state); | 68 bookmark_utils::RegisterPrefs(local_state); |
| 76 PageInfoModel::RegisterPrefs(local_state); | 69 PageInfoModel::RegisterPrefs(local_state); |
| 77 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 70 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 78 BrowserView::RegisterBrowserViewPrefs(local_state); | 71 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 79 #endif | 72 #endif |
| 80 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 81 TaskManager::RegisterPrefs(local_state); | 73 TaskManager::RegisterPrefs(local_state); |
| 82 #endif | |
| 83 } | 74 } |
| 84 | 75 |
| 85 void RegisterUserPrefs(PrefService* user_prefs) { | 76 void RegisterUserPrefs(PrefService* user_prefs) { |
| 86 // User prefs | 77 // User prefs |
| 87 AutoFillManager::RegisterUserPrefs(user_prefs); | 78 AutoFillManager::RegisterUserPrefs(user_prefs); |
| 88 SessionStartupPref::RegisterUserPrefs(user_prefs); | 79 SessionStartupPref::RegisterUserPrefs(user_prefs); |
| 89 Browser::RegisterUserPrefs(user_prefs); | 80 Browser::RegisterUserPrefs(user_prefs); |
| 90 PasswordManager::RegisterUserPrefs(user_prefs); | 81 PasswordManager::RegisterUserPrefs(user_prefs); |
| 91 chrome_browser_net::RegisterUserPrefs(user_prefs); | 82 chrome_browser_net::RegisterUserPrefs(user_prefs); |
| 92 DownloadManager::RegisterUserPrefs(user_prefs); | 83 DownloadManager::RegisterUserPrefs(user_prefs); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 103 DevToolsManager::RegisterUserPrefs(user_prefs); | 94 DevToolsManager::RegisterUserPrefs(user_prefs); |
| 104 #if defined(TOOLKIT_GTK) | 95 #if defined(TOOLKIT_GTK) |
| 105 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 96 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 106 #endif | 97 #endif |
| 107 #if defined(OS_CHROMEOS) | 98 #if defined(OS_CHROMEOS) |
| 108 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 99 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 109 #endif | 100 #endif |
| 110 } | 101 } |
| 111 | 102 |
| 112 } // namespace browser | 103 } // namespace browser |
| OLD | NEW |