| 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/about_flags.h" | 7 #include "chrome/browser/about_flags.h" |
| 8 #include "chrome/browser/autofill/autofill_manager.h" | 8 #include "chrome/browser/autofill/autofill_manager.h" |
| 9 #include "chrome/browser/background_contents_service.h" | 9 #include "chrome/browser/background_contents_service.h" |
| 10 #include "chrome/browser/background_mode_manager.h" | 10 #include "chrome/browser/background_mode_manager.h" |
| 11 #include "chrome/browser/bookmarks/bookmark_utils.h" | 11 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 12 #include "chrome/browser/browser.h" | |
| 13 #include "chrome/browser/browser_shutdown.h" | 12 #include "chrome/browser/browser_shutdown.h" |
| 14 #include "chrome/browser/debugger/devtools_manager.h" | 13 #include "chrome/browser/debugger/devtools_manager.h" |
| 15 #include "chrome/browser/dom_ui/flags_ui.h" | 14 #include "chrome/browser/dom_ui/flags_ui.h" |
| 16 #include "chrome/browser/dom_ui/new_tab_ui.h" | 15 #include "chrome/browser/dom_ui/new_tab_ui.h" |
| 17 #include "chrome/browser/dom_ui/plugins_ui.h" | 16 #include "chrome/browser/dom_ui/plugins_ui.h" |
| 18 #include "chrome/browser/download/download_prefs.h" | 17 #include "chrome/browser/download/download_prefs.h" |
| 19 #include "chrome/browser/extensions/extension_dom_ui.h" | 18 #include "chrome/browser/extensions/extension_dom_ui.h" |
| 20 #include "chrome/browser/extensions/extension_prefs.h" | 19 #include "chrome/browser/extensions/extension_prefs.h" |
| 21 #include "chrome/browser/extensions/extensions_ui.h" | 20 #include "chrome/browser/extensions/extensions_ui.h" |
| 22 #include "chrome/browser/external_protocol_handler.h" | 21 #include "chrome/browser/external_protocol_handler.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 42 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 41 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 43 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 42 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
| 44 #include "chrome/browser/search_engines/template_url_model.h" | 43 #include "chrome/browser/search_engines/template_url_model.h" |
| 45 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 44 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
| 46 #include "chrome/browser/ssl/ssl_manager.h" | 45 #include "chrome/browser/ssl/ssl_manager.h" |
| 47 #include "chrome/browser/sync/signin_manager.h" | 46 #include "chrome/browser/sync/signin_manager.h" |
| 48 #include "chrome/browser/tab_contents/tab_contents.h" | 47 #include "chrome/browser/tab_contents/tab_contents.h" |
| 49 #include "chrome/browser/tabs/pinned_tab_codec.h" | 48 #include "chrome/browser/tabs/pinned_tab_codec.h" |
| 50 #include "chrome/browser/task_manager/task_manager.h" | 49 #include "chrome/browser/task_manager/task_manager.h" |
| 51 #include "chrome/browser/translate/translate_prefs.h" | 50 #include "chrome/browser/translate/translate_prefs.h" |
| 51 #include "chrome/browser/ui/browser.h" |
| 52 #include "chrome/browser/upgrade_detector.h" | 52 #include "chrome/browser/upgrade_detector.h" |
| 53 | 53 |
| 54 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 54 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
| 55 #include "chrome/browser/views/browser_actions_container.h" | 55 #include "chrome/browser/views/browser_actions_container.h" |
| 56 #include "chrome/browser/views/frame/browser_view.h" | 56 #include "chrome/browser/views/frame/browser_view.h" |
| 57 #endif | 57 #endif |
| 58 | 58 |
| 59 #if defined(TOOLKIT_GTK) | 59 #if defined(TOOLKIT_GTK) |
| 60 #include "chrome/browser/gtk/browser_window_gtk.h" | 60 #include "chrome/browser/gtk/browser_window_gtk.h" |
| 61 #endif | 61 #endif |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 143 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
| 144 #endif | 144 #endif |
| 145 BackgroundContentsService::RegisterUserPrefs(user_prefs); | 145 BackgroundContentsService::RegisterUserPrefs(user_prefs); |
| 146 SigninManager::RegisterUserPrefs(user_prefs); | 146 SigninManager::RegisterUserPrefs(user_prefs); |
| 147 TemplateURLModel::RegisterUserPrefs(user_prefs); | 147 TemplateURLModel::RegisterUserPrefs(user_prefs); |
| 148 InstantController::RegisterUserPrefs(user_prefs); | 148 InstantController::RegisterUserPrefs(user_prefs); |
| 149 NetPrefObserver::RegisterPrefs(user_prefs); | 149 NetPrefObserver::RegisterPrefs(user_prefs); |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace browser | 152 } // namespace browser |
| OLD | NEW |