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

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: Rebase 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_oauth2_token_service.h" 132 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
133 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 133 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
134 #include "chrome/browser/chromeos/status/data_promo_notification.h" 134 #include "chrome/browser/chromeos/status/data_promo_notification.h"
135 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 135 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
136 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
136 #else 137 #else
137 #include "chrome/browser/extensions/default_apps.h" 138 #include "chrome/browser/extensions/default_apps.h"
138 #endif 139 #endif
139 140
140 #if defined(USE_ASH) 141 #if defined(USE_ASH)
141 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" 142 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
142 #endif 143 #endif
143 144
144 #if !defined(OS_ANDROID) 145 #if !defined(OS_ANDROID)
145 #include "chrome/browser/chrome_to_mobile_service.h" 146 #include "chrome/browser/chrome_to_mobile_service.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 #endif 348 #endif
348 349
349 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) 350 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
350 default_apps::RegisterUserPrefs(registry); 351 default_apps::RegisterUserPrefs(registry);
351 #endif 352 #endif
352 353
353 #if defined(OS_CHROMEOS) 354 #if defined(OS_CHROMEOS)
354 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); 355 chromeos::OAuth2LoginManager::RegisterUserPrefs(registry);
355 chromeos::Preferences::RegisterUserPrefs(registry); 356 chromeos::Preferences::RegisterUserPrefs(registry);
356 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); 357 chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry);
358 extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction::
359 RegisterUserPrefs(registry);
357 FlagsUI::RegisterUserPrefs(registry); 360 FlagsUI::RegisterUserPrefs(registry);
358 #endif 361 #endif
359 362
360 #if defined(OS_WIN) 363 #if defined(OS_WIN)
361 NetworkProfileBubble::RegisterUserPrefs(registry); 364 NetworkProfileBubble::RegisterUserPrefs(registry);
362 #endif 365 #endif
363 366
364 // Prefs registered only for migration (clearing or moving to a new 367 // Prefs registered only for migration (clearing or moving to a new
365 // key) go here. 368 // key) go here.
366 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(), 369 registry->RegisterDictionaryPref(kBackupPref, new DictionaryValue(),
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 } 445 }
443 local_state->ClearPref(prefs::kLastPromptedGoogleURL); 446 local_state->ClearPref(prefs::kLastPromptedGoogleURL);
444 447
445 current_version |= GOOGLE_URL_TRACKER_PREFS; 448 current_version |= GOOGLE_URL_TRACKER_PREFS;
446 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 449 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
447 current_version); 450 current_version);
448 } 451 }
449 } 452 }
450 453
451 } // namespace chrome 454 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698