OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/background_mode_manager.h" | 9 #include "chrome/browser/background/background_mode_manager.h" |
10 #include "chrome/browser/bookmarks/bookmark_model.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
(...skipping 23 matching lines...) Expand all Loading... |
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/policy/cloud_policy_subsystem.h" | 36 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
37 #include "chrome/browser/policy/url_blacklist_manager.h" | 37 #include "chrome/browser/policy/url_blacklist_manager.h" |
38 #include "chrome/browser/prefs/incognito_mode_prefs.h" | 38 #include "chrome/browser/prefs/incognito_mode_prefs.h" |
39 #include "chrome/browser/prefs/session_startup_pref.h" | 39 #include "chrome/browser/prefs/session_startup_pref.h" |
40 #include "chrome/browser/printing/print_job_manager.h" | 40 #include "chrome/browser/printing/print_job_manager.h" |
41 #include "chrome/browser/profiles/profile_impl.h" | 41 #include "chrome/browser/profiles/profile_impl.h" |
42 #include "chrome/browser/profiles/profile_info_cache.h" | 42 #include "chrome/browser/profiles/profile_info_cache.h" |
43 #include "chrome/browser/profiles/profile_manager.h" | 43 #include "chrome/browser/profiles/profile_manager.h" |
44 #include "chrome/browser/remoting/firewall_traversal_observer.h" | |
45 #include "chrome/browser/renderer_host/web_cache_manager.h" | 44 #include "chrome/browser/renderer_host/web_cache_manager.h" |
46 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 45 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
47 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" | 46 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" |
48 #include "chrome/browser/sync/signin_manager.h" | 47 #include "chrome/browser/sync/signin_manager.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" |
52 #include "chrome/browser/ui/browser.h" | 51 #include "chrome/browser/ui/browser.h" |
53 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" | 52 #include "chrome/browser/ui/search_engines/keyword_editor_controller.h" |
54 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 53 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 #elif defined(TOOLKIT_GTK) | 167 #elif defined(TOOLKIT_GTK) |
169 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 168 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
170 #endif | 169 #endif |
171 #if defined(OS_CHROMEOS) | 170 #if defined(OS_CHROMEOS) |
172 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 171 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
173 #endif | 172 #endif |
174 SigninManager::RegisterUserPrefs(user_prefs); | 173 SigninManager::RegisterUserPrefs(user_prefs); |
175 InstantController::RegisterUserPrefs(user_prefs); | 174 InstantController::RegisterUserPrefs(user_prefs); |
176 NetPrefObserver::RegisterPrefs(user_prefs); | 175 NetPrefObserver::RegisterPrefs(user_prefs); |
177 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 176 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
178 FirewallTraversalObserver::RegisterUserPrefs(user_prefs); | |
179 #if defined(OS_MACOSX) | 177 #if defined(OS_MACOSX) |
180 PresentationModePrefs::RegisterUserPrefs(user_prefs); | 178 PresentationModePrefs::RegisterUserPrefs(user_prefs); |
181 #endif | 179 #endif |
182 #if defined(ENABLE_CONFIGURATION_POLICY) | 180 #if defined(ENABLE_CONFIGURATION_POLICY) |
183 policy::URLBlacklistManager::RegisterPrefs(user_prefs); | 181 policy::URLBlacklistManager::RegisterPrefs(user_prefs); |
184 #endif | 182 #endif |
185 SyncPromoUI::RegisterUserPrefs(user_prefs); | 183 SyncPromoUI::RegisterUserPrefs(user_prefs); |
186 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); | 184 chrome_browser_net::HttpServerPropertiesManager::RegisterPrefs(user_prefs); |
187 } | 185 } |
188 | 186 |
(...skipping 21 matching lines...) Expand all Loading... |
210 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 208 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
211 } | 209 } |
212 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 210 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
213 | 211 |
214 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 212 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
215 current_version | WINDOWS_PREFS); | 213 current_version | WINDOWS_PREFS); |
216 } | 214 } |
217 } | 215 } |
218 | 216 |
219 } // namespace browser | 217 } // namespace browser |
OLD | NEW |