| 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/prefs/browser_prefs.h" | 5 #include "chrome/browser/prefs/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/background_mode_manager.h" | 9 #include "chrome/browser/background_mode_manager.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 #include "chrome/browser/notifications/desktop_notification_service.h" | 35 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 36 #include "chrome/browser/page_info_model.h" | 36 #include "chrome/browser/page_info_model.h" |
| 37 #include "chrome/browser/password_manager/password_manager.h" | 37 #include "chrome/browser/password_manager/password_manager.h" |
| 38 #include "chrome/browser/prefs/session_startup_pref.h" | 38 #include "chrome/browser/prefs/session_startup_pref.h" |
| 39 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 39 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
| 40 #include "chrome/browser/renderer_host/web_cache_manager.h" | 40 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 41 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 41 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 42 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 42 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
| 43 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 43 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 44 #include "chrome/browser/ssl/ssl_manager.h" | 44 #include "chrome/browser/ssl/ssl_manager.h" |
| 45 #include "chrome/browser/sync/signin_manager.h" |
| 45 #include "chrome/browser/tab_contents/tab_contents.h" | 46 #include "chrome/browser/tab_contents/tab_contents.h" |
| 46 #include "chrome/browser/tabs/pinned_tab_codec.h" | 47 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 47 #include "chrome/browser/task_manager.h" | 48 #include "chrome/browser/task_manager.h" |
| 48 #include "chrome/browser/translate/translate_prefs.h" | 49 #include "chrome/browser/translate/translate_prefs.h" |
| 49 #include "chrome/browser/upgrade_detector.h" | 50 #include "chrome/browser/upgrade_detector.h" |
| 50 | 51 |
| 51 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 52 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 52 #include "chrome/browser/views/browser_actions_container.h" | 53 #include "chrome/browser/views/browser_actions_container.h" |
| 53 #include "chrome/browser/views/frame/browser_view.h" | 54 #include "chrome/browser/views/frame/browser_view.h" |
| 54 #endif | 55 #endif |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 133 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
| 133 #elif defined(TOOLKIT_GTK) | 134 #elif defined(TOOLKIT_GTK) |
| 134 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 135 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
| 135 certificate_manager_util::RegisterUserPrefs(user_prefs); | 136 certificate_manager_util::RegisterUserPrefs(user_prefs); |
| 136 #endif | 137 #endif |
| 137 #if defined(OS_CHROMEOS) | 138 #if defined(OS_CHROMEOS) |
| 138 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 139 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 139 #endif | 140 #endif |
| 140 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 141 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 141 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); | 142 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); |
| 143 SigninManager::RegisterUserPrefs(user_prefs); |
| 142 } | 144 } |
| 143 | 145 |
| 144 } // namespace browser | 146 } // namespace browser |
| OLD | NEW |