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

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

Issue 14362031: Move part of WizardController static code to StartupUtils (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fighting with whitespaces again Created 7 years, 8 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 "apps/prefs.h" 7 #include "apps/prefs.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/about_flags.h" 10 #include "chrome/browser/about_flags.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 #endif 114 #endif
115 115
116 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
117 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 117 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
118 #include "chrome/browser/chromeos/audio/audio_handler.h" 118 #include "chrome/browser/chromeos/audio/audio_handler.h"
119 #include "chrome/browser/chromeos/audio/audio_pref_handler_impl.h" 119 #include "chrome/browser/chromeos/audio/audio_pref_handler_impl.h"
120 #include "chrome/browser/chromeos/customization_document.h" 120 #include "chrome/browser/chromeos/customization_document.h"
121 #include "chrome/browser/chromeos/display/display_preferences.h" 121 #include "chrome/browser/chromeos/display/display_preferences.h"
122 #include "chrome/browser/chromeos/login/login_utils.h" 122 #include "chrome/browser/chromeos/login/login_utils.h"
123 #include "chrome/browser/chromeos/login/oauth2_login_manager.h" 123 #include "chrome/browser/chromeos/login/oauth2_login_manager.h"
124 #include "chrome/browser/chromeos/login/startup_utils.h"
124 #include "chrome/browser/chromeos/login/user_image_manager.h" 125 #include "chrome/browser/chromeos/login/user_image_manager.h"
125 #include "chrome/browser/chromeos/login/user_manager.h" 126 #include "chrome/browser/chromeos/login/user_manager.h"
126 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 127 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
127 #include "chrome/browser/chromeos/login/wizard_controller.h"
128 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 128 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
129 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 129 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
130 #include "chrome/browser/chromeos/policy/device_status_collector.h" 130 #include "chrome/browser/chromeos/policy/device_status_collector.h"
131 #include "chrome/browser/chromeos/preferences.h" 131 #include "chrome/browser/chromeos/preferences.h"
132 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 132 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
133 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 133 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
134 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 134 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
135 #include "chrome/browser/chromeos/status/data_promo_notification.h" 135 #include "chrome/browser/chromeos/status/data_promo_notification.h"
136 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 136 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
137 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 137 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 chromeos::KioskAppManager::RegisterPrefs(registry); 248 chromeos::KioskAppManager::RegisterPrefs(registry);
249 chromeos::LoginUtils::RegisterPrefs(registry); 249 chromeos::LoginUtils::RegisterPrefs(registry);
250 chromeos::Preferences::RegisterPrefs(registry); 250 chromeos::Preferences::RegisterPrefs(registry);
251 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); 251 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
252 chromeos::RegisterDisplayLocalStatePrefs(registry); 252 chromeos::RegisterDisplayLocalStatePrefs(registry);
253 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 253 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
254 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 254 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
255 chromeos::UserImageManager::RegisterPrefs(registry); 255 chromeos::UserImageManager::RegisterPrefs(registry);
256 chromeos::UserManager::RegisterPrefs(registry); 256 chromeos::UserManager::RegisterPrefs(registry);
257 chromeos::WallpaperManager::RegisterPrefs(registry); 257 chromeos::WallpaperManager::RegisterPrefs(registry);
258 chromeos::WizardController::RegisterPrefs(registry); 258 chromeos::StartupUtils::RegisterPrefs(registry);
259 policy::AutoEnrollmentClient::RegisterPrefs(registry); 259 policy::AutoEnrollmentClient::RegisterPrefs(registry);
260 policy::DeviceStatusCollector::RegisterPrefs(registry); 260 policy::DeviceStatusCollector::RegisterPrefs(registry);
261 #endif 261 #endif
262 262
263 #if defined(OS_MACOSX) 263 #if defined(OS_MACOSX)
264 confirm_quit::RegisterLocalState(registry); 264 confirm_quit::RegisterLocalState(registry);
265 #endif 265 #endif
266 } 266 }
267 267
268 void RegisterUserPrefs(PrefRegistrySyncable* registry) { 268 void RegisterUserPrefs(PrefRegistrySyncable* registry) {
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 } 446 }
447 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 447 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
448 448
449 current_version |= GOOGLE_URL_TRACKER_PREFS; 449 current_version |= GOOGLE_URL_TRACKER_PREFS;
450 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 450 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
451 current_version); 451 current_version);
452 } 452 }
453 } 453 }
454 454
455 } // namespace chrome 455 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698