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

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

Issue 13132004: Implement Enterprise Key API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 125 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
126 #include "chrome/browser/chromeos/login/wizard_controller.h" 126 #include "chrome/browser/chromeos/login/wizard_controller.h"
127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 127 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 128 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
129 #include "chrome/browser/chromeos/policy/device_status_collector.h" 129 #include "chrome/browser/chromeos/policy/device_status_collector.h"
130 #include "chrome/browser/chromeos/preferences.h" 130 #include "chrome/browser/chromeos/preferences.h"
131 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 131 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
132 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 132 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
133 #include "chrome/browser/chromeos/status/data_promo_notification.h" 133 #include "chrome/browser/chromeos/status/data_promo_notification.h"
134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 134 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
135 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
135 #else 136 #else
136 #include "chrome/browser/extensions/default_apps.h" 137 #include "chrome/browser/extensions/default_apps.h"
137 #endif 138 #endif
138 139
139 #if defined(USE_ASH) 140 #if defined(USE_ASH)
140 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 141 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
141 #endif 142 #endif
142 143
143 #if !defined(OS_ANDROID) 144 #if !defined(OS_ANDROID)
144 #include "chrome/browser/chrome_to_mobile_service.h" 145 #include "chrome/browser/chrome_to_mobile_service.h"
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 #endif 346 #endif
346 347
347 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 348 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
348 default_apps::RegisterUserPrefs(registry); 349 default_apps::RegisterUserPrefs(registry);
349 #endif 350 #endif
350 351
351 #if defined(OS_CHROMEOS) 352 #if defined(OS_CHROMEOS)
352 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); 353 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
353 chromeos::Preferences::RegisterUserPrefs(registry); 354 chromeos::Preferences::RegisterUserPrefs(registry);
354 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); 355 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
356 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
357 RegisterUserPrefs(registry);
355 FlagsUI::RegisterUserPrefs(registry); 358 FlagsUI::RegisterUserPrefs(registry);
356 #endif 359 #endif
357 360
358 #if defined(OS_WIN) 361 #if defined(OS_WIN)
359 NetworkProfileBubble::RegisterUserPrefs(registry); 362 NetworkProfileBubble::RegisterUserPrefs(registry);
360 #endif 363 #endif
361 364
362 // Prefs registered only for migration (clearing or moving to a new 365 // Prefs registered only for migration (clearing or moving to a new
363 // key) go here. 366 // key) go here.
364 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), 367 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 } 443 }
441 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 444 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
442 445
443 current_version |= GOOGLE_URL_TRACKER_PREFS; 446 current_version |= GOOGLE_URL_TRACKER_PREFS;
444 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 447 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
445 current_version); 448 current_version);
446 } 449 }
447 } 450 }
448 451
449 } // namespace chrome 452 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698