OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 PasswordManager::RegisterUserPrefs(user_prefs); | 193 PasswordManager::RegisterUserPrefs(user_prefs); |
194 PinnedTabCodec::RegisterUserPrefs(user_prefs); | 194 PinnedTabCodec::RegisterUserPrefs(user_prefs); |
195 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); | 195 PrefProxyConfigTrackerImpl::RegisterPrefs(user_prefs); |
196 PrefsTabHelper::RegisterUserPrefs(user_prefs); | 196 PrefsTabHelper::RegisterUserPrefs(user_prefs); |
197 ProfileImpl::RegisterUserPrefs(user_prefs); | 197 ProfileImpl::RegisterUserPrefs(user_prefs); |
198 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); | 198 ProtocolHandlerRegistry::RegisterPrefs(user_prefs); |
199 SessionStartupPref::RegisterUserPrefs(user_prefs); | 199 SessionStartupPref::RegisterUserPrefs(user_prefs); |
200 SyncPromoUI::RegisterUserPrefs(user_prefs); | 200 SyncPromoUI::RegisterUserPrefs(user_prefs); |
201 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); | 201 TemplateURLPrepopulateData::RegisterUserPrefs(user_prefs); |
202 TranslatePrefs::RegisterUserPrefs(user_prefs); | 202 TranslatePrefs::RegisterUserPrefs(user_prefs); |
203 web_intents::RegisterUserPrefs(user_prefs); | |
204 | 203 |
205 #if defined(ENABLE_CONFIGURATION_POLICY) | 204 #if defined(ENABLE_CONFIGURATION_POLICY) |
206 policy::URLBlacklistManager::RegisterPrefs(user_prefs); | 205 policy::URLBlacklistManager::RegisterPrefs(user_prefs); |
207 #endif | 206 #endif |
208 | 207 |
209 #if defined(TOOLKIT_VIEWS) | 208 #if defined(TOOLKIT_VIEWS) |
210 BrowserActionsContainer::RegisterUserPrefs(user_prefs); | 209 BrowserActionsContainer::RegisterUserPrefs(user_prefs); |
211 #elif defined(TOOLKIT_GTK) | 210 #elif defined(TOOLKIT_GTK) |
212 BrowserWindowGtk::RegisterUserPrefs(user_prefs); | 211 BrowserWindowGtk::RegisterUserPrefs(user_prefs); |
213 #endif | 212 #endif |
214 | 213 |
215 #if defined(USE_ASH) | 214 #if defined(USE_ASH) |
216 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); | 215 ChromeLauncherDelegate::RegisterUserPrefs(user_prefs); |
217 #endif | 216 #endif |
218 | 217 |
219 #if !defined(OS_ANDROID) | 218 #if !defined(OS_ANDROID) |
220 PluginsUI::RegisterUserPrefs(user_prefs); | 219 PluginsUI::RegisterUserPrefs(user_prefs); |
221 PromoResourceService::RegisterUserPrefs(user_prefs); | 220 PromoResourceService::RegisterUserPrefs(user_prefs); |
| 221 web_intents::RegisterUserPrefs(user_prefs); |
222 #endif | 222 #endif |
223 | 223 |
224 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 224 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
225 default_apps::RegisterUserPrefs(user_prefs); | 225 default_apps::RegisterUserPrefs(user_prefs); |
226 #endif | 226 #endif |
227 | 227 |
228 #if defined(OS_CHROMEOS) | 228 #if defined(OS_CHROMEOS) |
229 chromeos::Preferences::RegisterUserPrefs(user_prefs); | 229 chromeos::Preferences::RegisterUserPrefs(user_prefs); |
230 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); | 230 chromeos::ProxyConfigServiceImpl::RegisterPrefs(user_prefs); |
231 #endif | 231 #endif |
(...skipping 28 matching lines...) Expand all Loading... |
260 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); | 260 user_prefs->Set(prefs::kBrowserWindowPlacement, *(pref->GetValue())); |
261 } | 261 } |
262 local_state->ClearPref(prefs::kBrowserWindowPlacement); | 262 local_state->ClearPref(prefs::kBrowserWindowPlacement); |
263 | 263 |
264 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, | 264 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, |
265 current_version | WINDOWS_PREFS); | 265 current_version | WINDOWS_PREFS); |
266 } | 266 } |
267 } | 267 } |
268 | 268 |
269 } // namespace browser | 269 } // namespace browser |
OLD | NEW |