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

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

Issue 273193006: Install Chrome OS apps to shared location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comment fixed Created 6 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
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" 153 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
154 #include "chrome/browser/chromeos/policy/device_status_collector.h" 154 #include "chrome/browser/chromeos/policy/device_status_collector.h"
155 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" 155 #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
156 #include "chrome/browser/chromeos/power/power_prefs.h" 156 #include "chrome/browser/chromeos/power/power_prefs.h"
157 #include "chrome/browser/chromeos/preferences.h" 157 #include "chrome/browser/chromeos/preferences.h"
158 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h" 158 #include "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
159 #include "chrome/browser/chromeos/settings/device_settings_cache.h" 159 #include "chrome/browser/chromeos/settings/device_settings_cache.h"
160 #include "chrome/browser/chromeos/status/data_promo_notification.h" 160 #include "chrome/browser/chromeos/status/data_promo_notification.h"
161 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 161 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
162 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h" 162 #include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterpr ise_platform_keys_private_api.h"
163 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
163 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 164 #include "chrome/browser/metrics/chromeos_metrics_provider.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/hid_detection_screen_handler.h" 166 #include "chrome/browser/ui/webui/chromeos/login/hid_detection_screen_handler.h"
166 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h" 167 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
167 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" 168 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
168 #else 169 #else
169 #include "chrome/browser/extensions/default_apps.h" 170 #include "chrome/browser/extensions/default_apps.h"
170 #endif 171 #endif
171 172
172 #if defined(OS_MACOSX) 173 #if defined(OS_MACOSX)
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 chromeos::proxy_config::RegisterPrefs(registry); 299 chromeos::proxy_config::RegisterPrefs(registry);
299 chromeos::RegisterDisplayLocalStatePrefs(registry); 300 chromeos::RegisterDisplayLocalStatePrefs(registry);
300 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry); 301 chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
301 chromeos::SigninScreenHandler::RegisterPrefs(registry); 302 chromeos::SigninScreenHandler::RegisterPrefs(registry);
302 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry); 303 chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
303 chromeos::UserImageManager::RegisterPrefs(registry); 304 chromeos::UserImageManager::RegisterPrefs(registry);
304 chromeos::UserManager::RegisterPrefs(registry); 305 chromeos::UserManager::RegisterPrefs(registry);
305 chromeos::WallpaperManager::RegisterPrefs(registry); 306 chromeos::WallpaperManager::RegisterPrefs(registry);
306 chromeos::StartupUtils::RegisterPrefs(registry); 307 chromeos::StartupUtils::RegisterPrefs(registry);
307 chromeos::echo_offer::RegisterPrefs(registry); 308 chromeos::echo_offer::RegisterPrefs(registry);
309 extensions::ExtensionAssetsManagerChromeOS::RegisterPrefs(registry);
308 policy::AutoEnrollmentClient::RegisterPrefs(registry); 310 policy::AutoEnrollmentClient::RegisterPrefs(registry);
309 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry); 311 policy::BrowserPolicyConnectorChromeOS::RegisterPrefs(registry);
310 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry); 312 policy::DeviceCloudPolicyManagerChromeOS::RegisterPrefs(registry);
311 policy::DeviceStatusCollector::RegisterPrefs(registry); 313 policy::DeviceStatusCollector::RegisterPrefs(registry);
312 policy::PolicyCertServiceFactory::RegisterPrefs(registry); 314 policy::PolicyCertServiceFactory::RegisterPrefs(registry);
313 #endif 315 #endif
314 316
315 #if defined(OS_MACOSX) 317 #if defined(OS_MACOSX)
316 confirm_quit::RegisterLocalState(registry); 318 confirm_quit::RegisterLocalState(registry);
317 QuitWithAppsController::RegisterPrefs(registry); 319 QuitWithAppsController::RegisterPrefs(registry);
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 local_state->SetInteger(prefs::kMultipleProfilePrefMigration, 575 local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
574 current_version); 576 current_version);
575 } 577 }
576 578
577 #if defined(OS_CHROMEOS) 579 #if defined(OS_CHROMEOS)
578 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state); 580 chromeos::default_pinned_apps_field_trial::MigratePrefs(local_state);
579 #endif 581 #endif
580 } 582 }
581 583
582 } // namespace chrome 584 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698