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

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

Issue 16254003: WIP (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #include "chrome/browser/chromeos/login/user_manager.h" 121 #include "chrome/browser/chromeos/login/user_manager.h"
122 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 122 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
123 #include "chrome/browser/chromeos/login/wizard_controller.h" 123 #include "chrome/browser/chromeos/login/wizard_controller.h"
124 #include "chrome/browser/chromeos/preferences.h" 124 #include "chrome/browser/chromeos/preferences.h"
125 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 125 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
126 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 126 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
127 #include "chrome/browser/chromeos/status/data_promo_notification.h" 127 #include "chrome/browser/chromeos/status/data_promo_notification.h"
128 #include "chrome/browser/policy/auto_enrollment_client.h" 128 #include "chrome/browser/policy/auto_enrollment_client.h"
129 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" 129 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
130 #include "chrome/browser/policy/device_status_collector.h" 130 #include "chrome/browser/policy/device_status_collector.h"
131 #include "chrome/browser/policy/policy_change_watcher.h"
131 #else 132 #else
132 #include "chrome/browser/extensions/default_apps.h" 133 #include "chrome/browser/extensions/default_apps.h"
133 #endif 134 #endif
134 135
135 #if defined(USE_ASH) 136 #if defined(USE_ASH)
136 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 137 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
137 #endif 138 #endif
138 139
139 #if !defined(OS_ANDROID) 140 #if !defined(OS_ANDROID)
140 #include "chrome/browser/chrome_to_mobile_service.h" 141 #include "chrome/browser/chrome_to_mobile_service.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 chromeos::Preferences::RegisterPrefs(registry); 240 chromeos::Preferences::RegisterPrefs(registry);
240 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry); 241 chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
241 chromeos::RegisterDisplayLocalStatePrefs(registry); 242 chromeos::RegisterDisplayLocalStatePrefs(registry);
242 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 243 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
243 chromeos::UserImageManager::RegisterPrefs(registry); 244 chromeos::UserImageManager::RegisterPrefs(registry);
244 chromeos::UserManager::RegisterPrefs(registry); 245 chromeos::UserManager::RegisterPrefs(registry);
245 chromeos::WallpaperManager::RegisterPrefs(registry); 246 chromeos::WallpaperManager::RegisterPrefs(registry);
246 chromeos::WizardController::RegisterPrefs(registry); 247 chromeos::WizardController::RegisterPrefs(registry);
247 policy::AutoEnrollmentClient::RegisterPrefs(registry); 248 policy::AutoEnrollmentClient::RegisterPrefs(registry);
248 policy::DeviceStatusCollector::RegisterPrefs(registry); 249 policy::DeviceStatusCollector::RegisterPrefs(registry);
250 policy::DevicePolicyChangeWatcher::RegisterPrefs(registry);
249 #endif 251 #endif
250 252
251 #if defined(OS_MACOSX) 253 #if defined(OS_MACOSX)
252 confirm_quit::RegisterLocalState(registry); 254 confirm_quit::RegisterLocalState(registry);
253 #endif 255 #endif
254 256
255 #if defined(ENABLE_SETTINGS_APP) 257 #if defined(ENABLE_SETTINGS_APP)
256 chrome::RegisterAppListPrefs(registry); 258 chrome::RegisterAppListPrefs(registry);
257 #endif 259 #endif
258 } 260 }
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 #endif 345 #endif
344 346
345 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 347 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
346 default_apps::RegisterUserPrefs(registry); 348 default_apps::RegisterUserPrefs(registry);
347 #endif 349 #endif
348 350
349 #if defined(OS_CHROMEOS) 351 #if defined(OS_CHROMEOS)
350 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); 352 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
351 chromeos::Preferences::RegisterUserPrefs(registry); 353 chromeos::Preferences::RegisterUserPrefs(registry);
352 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); 354 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
355 policy::UserPolicyChangeWatcher::RegisterUserPrefs(registry);
353 #endif 356 #endif
354 357
355 #if defined(OS_WIN) 358 #if defined(OS_WIN)
356 NetworkProfileBubble::RegisterUserPrefs(registry); 359 NetworkProfileBubble::RegisterUserPrefs(registry);
357 #endif 360 #endif
358 361
359 // Prefs registered only for migration (clearing or moving to a new 362 // Prefs registered only for migration (clearing or moving to a new
360 // key) go here. 363 // key) go here.
361 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), 364 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
362 PrefRegistrySyncable::UNSYNCABLE_PREF); 365 PrefRegistrySyncable::UNSYNCABLE_PREF);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 } 440 }
438 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 441 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
439 442
440 current_version |= GOOGLE_URL_TRACKER_PREFS; 443 current_version |= GOOGLE_URL_TRACKER_PREFS;
441 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
442 current_version); 445 current_version);
443 } 446 }
444 } 447 }
445 448
446 } // namespace chrome 449 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/user_policy_signin_service.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698