| 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" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "chrome/browser/session_startup_pref.h" | 36 #include "chrome/browser/session_startup_pref.h" |
| 37 #include "chrome/browser/ssl/ssl_manager.h" | 37 #include "chrome/browser/ssl/ssl_manager.h" |
| 38 #include "chrome/browser/tabs/pinned_tab_codec.h" | 38 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 39 #include "chrome/browser/tab_contents/tab_contents.h" | 39 #include "chrome/browser/tab_contents/tab_contents.h" |
| 40 #include "chrome/browser/task_manager.h" | 40 #include "chrome/browser/task_manager.h" |
| 41 #include "chrome/browser/translate/translate_prefs.h" | 41 #include "chrome/browser/translate/translate_prefs.h" |
| 42 | 42 |
| 43 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 43 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 44 #include "chrome/browser/views/browser_actions_container.h" | 44 #include "chrome/browser/views/browser_actions_container.h" |
| 45 #include "chrome/browser/views/frame/browser_view.h" | 45 #include "chrome/browser/views/frame/browser_view.h" |
| 46 #include "chrome/browser/views/update_recommended_message_box.h" |
| 46 #endif | 47 #endif |
| 47 | 48 |
| 48 #if defined(TOOLKIT_GTK) | 49 #if defined(TOOLKIT_GTK) |
| 49 #include "chrome/browser/gtk/browser_window_gtk.h" | 50 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 50 #endif | 51 #endif |
| 51 | 52 |
| 52 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
| 53 #include "chrome/browser/chromeos/login/user_manager.h" | 54 #include "chrome/browser/chromeos/login/user_manager.h" |
| 54 #include "chrome/browser/chromeos/preferences.h" | 55 #include "chrome/browser/chromeos/preferences.h" |
| 55 #endif | 56 #endif |
| (...skipping 16 matching lines...) Expand all Loading... |
| 72 MetricsLog::RegisterPrefs(local_state); | 73 MetricsLog::RegisterPrefs(local_state); |
| 73 MetricsService::RegisterPrefs(local_state); | 74 MetricsService::RegisterPrefs(local_state); |
| 74 SafeBrowsingService::RegisterPrefs(local_state); | 75 SafeBrowsingService::RegisterPrefs(local_state); |
| 75 browser_shutdown::RegisterPrefs(local_state); | 76 browser_shutdown::RegisterPrefs(local_state); |
| 76 chrome_browser_net::RegisterPrefs(local_state); | 77 chrome_browser_net::RegisterPrefs(local_state); |
| 77 bookmark_utils::RegisterPrefs(local_state); | 78 bookmark_utils::RegisterPrefs(local_state); |
| 78 PageInfoModel::RegisterPrefs(local_state); | 79 PageInfoModel::RegisterPrefs(local_state); |
| 79 #if defined(TOOLKIT_VIEWS) | 80 #if defined(TOOLKIT_VIEWS) |
| 80 BrowserView::RegisterBrowserViewPrefs(local_state); | 81 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 81 #endif | 82 #endif |
| 83 #if defined(OS_WIN) |
| 84 UpdateRecommendedMessageBox::RegisterUpdateRecommendedPrefs(local_state); |
| 85 #endif |
| 82 TaskManager::RegisterPrefs(local_state); | 86 TaskManager::RegisterPrefs(local_state); |
| 83 CookiePromptModalDialog::RegisterPrefs(local_state); | 87 CookiePromptModalDialog::RegisterPrefs(local_state); |
| 84 geolocation::RegisterPrefs(local_state); | 88 geolocation::RegisterPrefs(local_state); |
| 85 AutoFillManager::RegisterBrowserPrefs(local_state); | 89 AutoFillManager::RegisterBrowserPrefs(local_state); |
| 86 #if defined(OS_CHROMEOS) | 90 #if defined(OS_CHROMEOS) |
| 87 chromeos::UserManager::RegisterPrefs(local_state); | 91 chromeos::UserManager::RegisterPrefs(local_state); |
| 88 #endif | 92 #endif |
| 89 } | 93 } |
| 90 | 94 |
| 91 void RegisterUserPrefs(PrefService* user_prefs) { | 95 void RegisterUserPrefs(PrefService* user_prefs) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 115 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 119 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
| 116 #elif defined(TOOLKIT_GTK) | 120 #elif defined(TOOLKIT_GTK) |
| 117 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 121 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 118 #endif | 122 #endif |
| 119 #if defined(OS_CHROMEOS) | 123 #if defined(OS_CHROMEOS) |
| 120 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 124 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 121 #endif | 125 #endif |
| 122 } | 126 } |
| 123 | 127 |
| 124 } // namespace browser | 128 } // namespace browser |
| OLD | NEW |