| 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/background_contents_service.h" | 8 #include "chrome/browser/background_contents_service.h" |
| 9 #include "chrome/browser/bookmarks/bookmark_utils.h" | 9 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 10 #include "chrome/browser/browser.h" | 10 #include "chrome/browser/browser.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 MetricsService::RegisterPrefs(local_state); | 79 MetricsService::RegisterPrefs(local_state); |
| 80 SafeBrowsingService::RegisterPrefs(local_state); | 80 SafeBrowsingService::RegisterPrefs(local_state); |
| 81 browser_shutdown::RegisterPrefs(local_state); | 81 browser_shutdown::RegisterPrefs(local_state); |
| 82 chrome_browser_net::RegisterPrefs(local_state); | 82 chrome_browser_net::RegisterPrefs(local_state); |
| 83 PageInfoModel::RegisterPrefs(local_state); | 83 PageInfoModel::RegisterPrefs(local_state); |
| 84 #if defined(TOOLKIT_VIEWS) | 84 #if defined(TOOLKIT_VIEWS) |
| 85 BrowserView::RegisterBrowserViewPrefs(local_state); | 85 BrowserView::RegisterBrowserViewPrefs(local_state); |
| 86 #endif | 86 #endif |
| 87 UpgradeDetector::RegisterPrefs(local_state); | 87 UpgradeDetector::RegisterPrefs(local_state); |
| 88 TaskManager::RegisterPrefs(local_state); | 88 TaskManager::RegisterPrefs(local_state); |
| 89 CookiePromptModalDialog::RegisterPrefs(local_state); | |
| 90 geolocation::RegisterPrefs(local_state); | 89 geolocation::RegisterPrefs(local_state); |
| 91 AutoFillManager::RegisterBrowserPrefs(local_state); | 90 AutoFillManager::RegisterBrowserPrefs(local_state); |
| 92 #if defined(OS_CHROMEOS) | 91 #if defined(OS_CHROMEOS) |
| 93 chromeos::UserManager::RegisterPrefs(local_state); | 92 chromeos::UserManager::RegisterPrefs(local_state); |
| 94 WizardController::RegisterPrefs(local_state); | 93 WizardController::RegisterPrefs(local_state); |
| 95 chromeos::LanguageMenuButton::RegisterPrefs(local_state); | 94 chromeos::LanguageMenuButton::RegisterPrefs(local_state); |
| 96 #endif | 95 #endif |
| 97 } | 96 } |
| 98 | 97 |
| 99 void RegisterUserPrefs(PrefService* user_prefs) { | 98 void RegisterUserPrefs(PrefService* user_prefs) { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 123 #if defined(TOOLKIT_VIEWS) | 122 #if defined(TOOLKIT_VIEWS) |
| 124 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 123 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
| 125 #elif defined(TOOLKIT_GTK) | 124 #elif defined(TOOLKIT_GTK) |
| 126 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 125 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 127 certificate_manager_util::RegisterUserPrefs(user_prefs); | 126 certificate_manager_util::RegisterUserPrefs(user_prefs); |
| 128 #endif | 127 #endif |
| 129 #if defined(OS_CHROMEOS) | 128 #if defined(OS_CHROMEOS) |
| 130 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 129 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 131 #endif | 130 #endif |
| 132 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 131 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 132 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); |
| 133 } | 133 } |
| 134 | 134 |
| 135 } // namespace browser | 135 } // namespace browser |
| OLD | NEW |