Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: chrome/browser/prefs/browser_prefs.cc

Issue 10829019: [sync] Refactor how default sync datatypes are set. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Registering extension prefs and using standard constructor Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/accessibility/invert_bubble_prefs.h" 8 #include "chrome/browser/accessibility/invert_bubble_prefs.h"
9 #include "chrome/browser/autofill/autofill_manager.h" 9 #include "chrome/browser/autofill/autofill_manager.h"
10 #include "chrome/browser/background/background_mode_manager.h" 10 #include "chrome/browser/background/background_mode_manager.h"
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 #endif 231 #endif
232 232
233 #if defined(OS_ANDROID) 233 #if defined(OS_ANDROID)
234 geolocation::RegisterUserPrefs(user_prefs); 234 geolocation::RegisterUserPrefs(user_prefs);
235 #endif 235 #endif
236 236
237 #if defined(USE_ASH) 237 #if defined(USE_ASH)
238 ash::RegisterChromeLauncherUserPrefs(user_prefs); 238 ash::RegisterChromeLauncherUserPrefs(user_prefs);
239 #endif 239 #endif
240 240
241 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
akalin 2012/07/31 22:25:22 mention somewhere why this was moved out?
nyquist 2012/08/02 18:28:17 Added reason to CL description. Should help people
242
241 #if !defined(OS_ANDROID) 243 #if !defined(OS_ANDROID)
242 AppsPromo::RegisterUserPrefs(user_prefs); 244 AppsPromo::RegisterUserPrefs(user_prefs);
243 ChromeToMobileService::RegisterUserPrefs(user_prefs); 245 ChromeToMobileService::RegisterUserPrefs(user_prefs);
244 extensions::CommandService::RegisterUserPrefs(user_prefs); 246 extensions::CommandService::RegisterUserPrefs(user_prefs);
245 extensions::ComponentLoader::RegisterUserPrefs(user_prefs); 247 extensions::ComponentLoader::RegisterUserPrefs(user_prefs);
246 extensions::ExtensionPrefs::RegisterUserPrefs(user_prefs);
247 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs); 248 ExtensionSettingsHandler::RegisterUserPrefs(user_prefs);
248 ExtensionWebUI::RegisterUserPrefs(user_prefs); 249 ExtensionWebUI::RegisterUserPrefs(user_prefs);
249 RegisterBrowserUserPrefs(user_prefs); 250 RegisterBrowserUserPrefs(user_prefs);
250 RegisterAutolaunchPrefs(user_prefs); 251 RegisterAutolaunchPrefs(user_prefs);
251 DevToolsWindow::RegisterUserPrefs(user_prefs); 252 DevToolsWindow::RegisterUserPrefs(user_prefs);
252 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs); 253 PepperFlashSettingsManager::RegisterUserPrefs(user_prefs);
253 PinnedTabCodec::RegisterUserPrefs(user_prefs); 254 PinnedTabCodec::RegisterUserPrefs(user_prefs);
254 PluginsUI::RegisterUserPrefs(user_prefs); 255 PluginsUI::RegisterUserPrefs(user_prefs);
255 SyncPromoUI::RegisterUserPrefs(user_prefs); 256 SyncPromoUI::RegisterUserPrefs(user_prefs);
256 printing::StickySettings::RegisterUserPrefs(user_prefs); 257 printing::StickySettings::RegisterUserPrefs(user_prefs);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 332 }
332 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 333 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
333 334
334 current_version |= GOOGLE_URL_TRACKER_PREFS; 335 current_version |= GOOGLE_URL_TRACKER_PREFS;
335 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 336 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
336 current_version); 337 current_version);
337 } 338 }
338 } 339 }
339 340
340 } // namespace chrome 341 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698