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

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

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, remove blocking GetOwnershipStatus() 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #endif 89 #endif
90 90
91 #if defined(OS_CHROMEOS) 91 #if defined(OS_CHROMEOS)
92 #include "chrome/browser/chromeos/audio/audio_handler.h" 92 #include "chrome/browser/chromeos/audio/audio_handler.h"
93 #include "chrome/browser/chromeos/customization_document.h" 93 #include "chrome/browser/chromeos/customization_document.h"
94 #include "chrome/browser/chromeos/login/user_manager.h" 94 #include "chrome/browser/chromeos/login/user_manager.h"
95 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 95 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
96 #include "chrome/browser/chromeos/login/wizard_controller.h" 96 #include "chrome/browser/chromeos/login/wizard_controller.h"
97 #include "chrome/browser/chromeos/preferences.h" 97 #include "chrome/browser/chromeos/preferences.h"
98 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 98 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
99 #include "chrome/browser/chromeos/settings/signed_settings_cache.h" 99 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
100 #include "chrome/browser/chromeos/status/data_promo_notification.h" 100 #include "chrome/browser/chromeos/status/data_promo_notification.h"
101 #include "chrome/browser/policy/auto_enrollment_client.h" 101 #include "chrome/browser/policy/auto_enrollment_client.h"
102 #include "chrome/browser/policy/device_status_collector.h" 102 #include "chrome/browser/policy/device_status_collector.h"
103 #else 103 #else
104 #include "chrome/browser/extensions/default_apps.h" 104 #include "chrome/browser/extensions/default_apps.h"
105 #endif 105 #endif
106 106
107 #if defined(USE_ASH) 107 #if defined(USE_ASH)
108 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 108 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
109 #endif 109 #endif
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 UpgradeDetector::RegisterPrefs(local_state); 171 UpgradeDetector::RegisterPrefs(local_state);
172 #endif 172 #endif
173 173
174 #if defined(OS_CHROMEOS) 174 #if defined(OS_CHROMEOS)
175 chromeos::AudioHandler::RegisterPrefs(local_state); 175 chromeos::AudioHandler::RegisterPrefs(local_state);
176 chromeos::language_prefs::RegisterPrefs(local_state); 176 chromeos::language_prefs::RegisterPrefs(local_state);
177 chromeos::DataPromoNotification::RegisterPrefs(local_state); 177 chromeos::DataPromoNotification::RegisterPrefs(local_state);
178 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state); 178 chromeos::ProxyConfigServiceImpl::RegisterPrefs(local_state);
179 chromeos::UserManager::RegisterPrefs(local_state); 179 chromeos::UserManager::RegisterPrefs(local_state);
180 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state); 180 chromeos::ServicesCustomizationDocument::RegisterPrefs(local_state);
181 chromeos::signed_settings_cache::RegisterPrefs(local_state); 181 chromeos::device_settings_cache::RegisterPrefs(local_state);
182 chromeos::WallpaperManager::RegisterPrefs(local_state); 182 chromeos::WallpaperManager::RegisterPrefs(local_state);
183 chromeos::WizardController::RegisterPrefs(local_state); 183 chromeos::WizardController::RegisterPrefs(local_state);
184 policy::AutoEnrollmentClient::RegisterPrefs(local_state); 184 policy::AutoEnrollmentClient::RegisterPrefs(local_state);
185 policy::DeviceStatusCollector::RegisterPrefs(local_state); 185 policy::DeviceStatusCollector::RegisterPrefs(local_state);
186 #endif 186 #endif
187 187
188 #if defined(OS_MACOSX) 188 #if defined(OS_MACOSX)
189 RegisterObsoleteOSInfobarPrefs(local_state); 189 RegisterObsoleteOSInfobarPrefs(local_state);
190 confirm_quit::RegisterLocalState(local_state); 190 confirm_quit::RegisterLocalState(local_state);
191 #endif 191 #endif
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 330 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
331 331
332 current_version |= GOOGLE_URL_TRACKER_PREFS; 332 current_version |= GOOGLE_URL_TRACKER_PREFS;
333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 333 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
334 current_version); 334 current_version);
335 } 335 }
336 } 336 }
337 337
338 } // namespace chrome 338 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698