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 15 matching lines...) Expand all Loading... |
26 #include "chrome/browser/page_info_model.h" | 26 #include "chrome/browser/page_info_model.h" |
27 #include "chrome/browser/password_manager/password_manager.h" | 27 #include "chrome/browser/password_manager/password_manager.h" |
28 #include "chrome/browser/privacy_blacklist/blacklist.h" | 28 #include "chrome/browser/privacy_blacklist/blacklist.h" |
29 #include "chrome/browser/renderer_host/browser_render_process_host.h" | 29 #include "chrome/browser/renderer_host/browser_render_process_host.h" |
30 #include "chrome/browser/renderer_host/web_cache_manager.h" | 30 #include "chrome/browser/renderer_host/web_cache_manager.h" |
31 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 31 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
32 #include "chrome/browser/search_engines/keyword_editor_controller.h" | 32 #include "chrome/browser/search_engines/keyword_editor_controller.h" |
33 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 33 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
34 #include "chrome/browser/session_startup_pref.h" | 34 #include "chrome/browser/session_startup_pref.h" |
35 #include "chrome/browser/ssl/ssl_manager.h" | 35 #include "chrome/browser/ssl/ssl_manager.h" |
| 36 #include "chrome/browser/tabs/pinned_tab_codec.h" |
36 #include "chrome/browser/tab_contents/tab_contents.h" | 37 #include "chrome/browser/tab_contents/tab_contents.h" |
37 #include "chrome/browser/task_manager.h" | 38 #include "chrome/browser/task_manager.h" |
38 | 39 |
39 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port | 40 #if defined(TOOLKIT_VIEWS) // TODO(port): whittle this down as we port |
40 #include "chrome/browser/views/browser_actions_container.h" | 41 #include "chrome/browser/views/browser_actions_container.h" |
41 #include "chrome/browser/views/frame/browser_view.h" | 42 #include "chrome/browser/views/frame/browser_view.h" |
42 #endif | 43 #endif |
43 | 44 |
44 #if defined(TOOLKIT_GTK) | 45 #if defined(TOOLKIT_GTK) |
45 #include "chrome/browser/gtk/browser_window_gtk.h" | 46 #include "chrome/browser/gtk/browser_window_gtk.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 bookmark_utils::RegisterUserPrefs(user_prefs); | 93 bookmark_utils::RegisterUserPrefs(user_prefs); |
93 TabContents::RegisterUserPrefs(user_prefs); | 94 TabContents::RegisterUserPrefs(user_prefs); |
94 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 95 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
95 ExtensionDOMUI::RegisterUserPrefs(user_prefs); | 96 ExtensionDOMUI::RegisterUserPrefs(user_prefs); |
96 ExtensionsUI::RegisterUserPrefs(user_prefs); | 97 ExtensionsUI::RegisterUserPrefs(user_prefs); |
97 NewTabUI::RegisterUserPrefs(user_prefs); | 98 NewTabUI::RegisterUserPrefs(user_prefs); |
98 HostContentSettingsMap::RegisterUserPrefs(user_prefs); | 99 HostContentSettingsMap::RegisterUserPrefs(user_prefs); |
99 HostZoomMap::RegisterUserPrefs(user_prefs); | 100 HostZoomMap::RegisterUserPrefs(user_prefs); |
100 DevToolsManager::RegisterUserPrefs(user_prefs); | 101 DevToolsManager::RegisterUserPrefs(user_prefs); |
101 Blacklist::RegisterUserPrefs(user_prefs); | 102 Blacklist::RegisterUserPrefs(user_prefs); |
| 103 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
102 ExtensionPrefs::RegisterUserPrefs(user_prefs); | 104 ExtensionPrefs::RegisterUserPrefs(user_prefs); |
103 #if defined(TOOLKIT_VIEWS) | 105 #if defined(TOOLKIT_VIEWS) |
104 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 106 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
105 #elif defined(TOOLKIT_GTK) | 107 #elif defined(TOOLKIT_GTK) |
106 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 108 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
107 #endif | 109 #endif |
108 #if defined(OS_CHROMEOS) | 110 #if defined(OS_CHROMEOS) |
109 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 111 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
110 #endif | 112 #endif |
111 } | 113 } |
112 | 114 |
113 } // namespace browser | 115 } // namespace browser |
OLD | NEW |