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

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

Issue 117263002: Prevent ONC-pushed certificates from being used with multiprofiles. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Philipps suggestion, another test Created 7 years 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/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h" 147 #include "chrome/browser/chromeos/login/multi_profile_user_controller.h"
148 #include "chrome/browser/chromeos/login/startup_utils.h" 148 #include "chrome/browser/chromeos/login/startup_utils.h"
149 #include "chrome/browser/chromeos/login/user_image_manager.h" 149 #include "chrome/browser/chromeos/login/user_image_manager.h"
150 #include "chrome/browser/chromeos/login/user_image_sync_observer.h" 150 #include "chrome/browser/chromeos/login/user_image_sync_observer.h"
151 #include "chrome/browser/chromeos/login/user_manager.h" 151 #include "chrome/browser/chromeos/login/user_manager.h"
152 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 152 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
153 #include "chrome/browser/chromeos/net/proxy_config_handler.h" 153 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
154 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" 154 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
155 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 155 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
156 #include "chrome/browser/chromeos/policy/device_status_collector.h" 156 #include "chrome/browser/chromeos/policy/device_status_collector.h"
157 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
157 #include "chrome/browser/chromeos/power/power_prefs.h" 158 #include "chrome/browser/chromeos/power/power_prefs.h"
158 #include "chrome/browser/chromeos/preferences.h" 159 #include "chrome/browser/chromeos/preferences.h"
159 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 160 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
160 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 161 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
161 #include "chrome/browser/chromeos/status/data_promo_notification.h" 162 #include "chrome/browser/chromeos/status/data_promo_notification.h"
162 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 163 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
163 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 164 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
164 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" 165 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h"
165 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 166 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
166 #else 167 #else
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 chromeos::SigninScreenHandler::RegisterPrefs(registry); 300 chromeos::SigninScreenHandler::RegisterPrefs(registry);
300 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 301 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
301 chromeos::UserImageManager::RegisterPrefs(registry); 302 chromeos::UserImageManager::RegisterPrefs(registry);
302 chromeos::UserManager::RegisterPrefs(registry); 303 chromeos::UserManager::RegisterPrefs(registry);
303 chromeos::WallpaperManager::RegisterPrefs(registry); 304 chromeos::WallpaperManager::RegisterPrefs(registry);
304 chromeos::StartupUtils::RegisterPrefs(registry); 305 chromeos::StartupUtils::RegisterPrefs(registry);
305 chromeos::echo_offer::RegisterPrefs(registry); 306 chromeos::echo_offer::RegisterPrefs(registry);
306 policy::AutoEnrollmentClient::RegisterPrefs(registry); 307 policy::AutoEnrollmentClient::RegisterPrefs(registry);
307 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 308 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
308 policy::DeviceStatusCollector::RegisterPrefs(registry); 309 policy::DeviceStatusCollector::RegisterPrefs(registry);
310 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
309 #endif 311 #endif
310 312
311 #if defined(OS_MACOSX) 313 #if defined(OS_MACOSX)
312 confirm_quit::RegisterLocalState(registry); 314 confirm_quit::RegisterLocalState(registry);
313 #endif 315 #endif
314 316
315 #if defined(OS_WIN) 317 #if defined(OS_WIN)
316 app_metro_launch::RegisterPrefs(registry); 318 app_metro_launch::RegisterPrefs(registry);
317 PasswordManager::RegisterLocalPrefs(registry); 319 PasswordManager::RegisterLocalPrefs(registry);
318 #endif 320 #endif
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 572 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
571 current_version); 573 current_version);
572 } 574 }
573 575
574 #if defined(OS_CHROMEOS) 576 #if defined(OS_CHROMEOS)
575 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 577 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
576 #endif 578 #endif
577 } 579 }
578 580
579 } // namespace chrome 581 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698