| 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/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" |
| 11 #include "chrome/browser/browser.h" | 11 #include "chrome/browser/browser.h" |
| 12 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 13 #include "chrome/browser/cookie_modal_dialog.h" | 13 #include "chrome/browser/cookie_modal_dialog.h" |
| 14 #include "chrome/browser/debugger/devtools_manager.h" | 14 #include "chrome/browser/debugger/devtools_manager.h" |
| 15 #include "chrome/browser/dom_ui/new_tab_ui.h" | 15 #include "chrome/browser/dom_ui/new_tab_ui.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 26 #include "chrome/browser/host_content_settings_map.h" | 26 #include "chrome/browser/host_content_settings_map.h" |
| 27 #include "chrome/browser/host_zoom_map.h" | 27 #include "chrome/browser/host_zoom_map.h" |
| 28 #include "chrome/browser/intranet_redirect_detector.h" | 28 #include "chrome/browser/intranet_redirect_detector.h" |
| 29 #include "chrome/browser/metrics/metrics_log.h" | 29 #include "chrome/browser/metrics/metrics_log.h" |
| 30 #include "chrome/browser/metrics/metrics_service.h" | 30 #include "chrome/browser/metrics/metrics_service.h" |
| 31 #include "chrome/browser/net/chrome_url_request_context.h" | 31 #include "chrome/browser/net/chrome_url_request_context.h" |
| 32 #include "chrome/browser/net/predictor_api.h" | 32 #include "chrome/browser/net/predictor_api.h" |
| 33 #include "chrome/browser/notifications/desktop_notification_service.h" | 33 #include "chrome/browser/notifications/desktop_notification_service.h" |
| 34 #include "chrome/browser/page_info_model.h" | 34 #include "chrome/browser/page_info_model.h" |
| 35 #include "chrome/browser/password_manager/password_manager.h" | 35 #include "chrome/browser/password_manager/password_manager.h" |
| 36 #include "chrome/browser/prefs/session_startup_pref.h" |
| 36 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 37 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
| 37 #include "chrome/browser/renderer_host/web_cache_manager.h" | 38 #include "chrome/browser/renderer_host/web_cache_manager.h" |
| 38 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 39 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 39 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 40 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
| 40 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 41 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 41 #include "chrome/browser/session_startup_pref.h" | |
| 42 #include "chrome/browser/ssl/ssl_manager.h" | 42 #include "chrome/browser/ssl/ssl_manager.h" |
| 43 #include "chrome/browser/tab_contents/tab_contents.h" |
| 43 #include "chrome/browser/tabs/pinned_tab_codec.h" | 44 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 44 #include "chrome/browser/tab_contents/tab_contents.h" | |
| 45 #include "chrome/browser/task_manager.h" | 45 #include "chrome/browser/task_manager.h" |
| 46 #include "chrome/browser/translate/translate_prefs.h" | 46 #include "chrome/browser/translate/translate_prefs.h" |
| 47 #include "chrome/browser/upgrade_detector.h" | 47 #include "chrome/browser/upgrade_detector.h" |
| 48 | 48 |
| 49 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 49 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 50 #include "chrome/browser/views/browser_actions_container.h" | 50 #include "chrome/browser/views/browser_actions_container.h" |
| 51 #include "chrome/browser/views/frame/browser_view.h" | 51 #include "chrome/browser/views/frame/browser_view.h" |
| 52 #endif | 52 #endif |
| 53 | 53 |
| 54 #if defined(TOOLKIT_GTK) | 54 #if defined(TOOLKIT_GTK) |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 certificate_manager_util::RegisterUserPrefs(user_prefs); | 131 certificate_manager_util::RegisterUserPrefs(user_prefs); |
| 132 #endif | 132 #endif |
| 133 #if defined(OS_CHROMEOS) | 133 #if defined(OS_CHROMEOS) |
| 134 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 134 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 135 #endif | 135 #endif |
| 136 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 136 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 137 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); | 137 CookiePromptModalDialog::RegisterUserPrefs(user_prefs); |
| 138 } | 138 } |
| 139 | 139 |
| 140 } // namespace browser | 140 } // namespace browser |
| OLD | NEW |