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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser.gypi

Issue 10824112: Move Chrome OS device settings stuff to chrome/browser/chromeos/settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 85a2bcf3243a2cce50809ae514d6df11fc5343b3..4a1ac88433e038a7def001b1535ccb63c91e1bee 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -495,12 +495,6 @@
'browser/chromeos/cros/onc_network_parser.h',
'browser/chromeos/cros/sms_watcher.cc',
'browser/chromeos/cros/sms_watcher.h',
- 'browser/chromeos/cros_settings.cc',
- 'browser/chromeos/cros_settings.h',
- 'browser/chromeos/cros_settings_names.cc',
- 'browser/chromeos/cros_settings_names.h',
- 'browser/chromeos/cros_settings_provider.cc',
- 'browser/chromeos/cros_settings_provider.h',
'browser/chromeos/cryptohome/async_method_caller.cc',
'browser/chromeos/cryptohome/async_method_caller.h',
'browser/chromeos/customization_document.cc',
@@ -510,8 +504,6 @@
'browser/chromeos/dbus/proxy_resolution_service_provider.cc',
'browser/chromeos/dbus/proxy_resolution_service_provider.h',
'browser/chromeos/device_hierarchy_observer.h',
- 'browser/chromeos/device_settings_provider.cc',
- 'browser/chromeos/device_settings_provider.h',
'browser/chromeos/disks/disk_mount_manager.cc',
'browser/chromeos/disks/disk_mount_manager.h',
'browser/chromeos/enrollment_dialog_view.cc',
@@ -720,12 +712,6 @@
'browser/chromeos/login/online_attempt_host.cc',
'browser/chromeos/login/online_attempt_host.h',
'browser/chromeos/login/oobe_display.h',
- 'browser/chromeos/login/owner_key_utils.cc',
- 'browser/chromeos/login/owner_key_utils.h',
- 'browser/chromeos/login/owner_manager.cc',
- 'browser/chromeos/login/owner_manager.h',
- 'browser/chromeos/login/ownership_service.cc',
- 'browser/chromeos/login/ownership_service.h',
'browser/chromeos/login/parallel_authenticator.cc',
'browser/chromeos/login/parallel_authenticator.h',
'browser/chromeos/login/password_changed_view.cc',
@@ -744,14 +730,6 @@
'browser/chromeos/login/screen_locker_delegate.cc',
'browser/chromeos/login/screen_locker_delegate.h',
'browser/chromeos/login/screen_observer.h',
- 'browser/chromeos/login/session_manager_observer.cc',
- 'browser/chromeos/login/session_manager_observer.h',
- 'browser/chromeos/login/signed_settings.cc',
- 'browser/chromeos/login/signed_settings.h',
- 'browser/chromeos/login/signed_settings_cache.cc',
- 'browser/chromeos/login/signed_settings_cache.h',
- 'browser/chromeos/login/signed_settings_helper.cc',
- 'browser/chromeos/login/signed_settings_helper.h',
'browser/chromeos/login/simple_web_view_dialog.cc',
'browser/chromeos/login/simple_web_view_dialog.h',
'browser/chromeos/login/take_photo_view.cc',
@@ -875,8 +853,34 @@
'browser/chromeos/proxy_config_service_impl.h',
'browser/chromeos/proxy_cros_settings_parser.cc',
'browser/chromeos/proxy_cros_settings_parser.h',
- 'browser/chromeos/signed_settings_migration_helper.cc',
- 'browser/chromeos/signed_settings_migration_helper.h',
+ 'browser/chromeos/settings/cros_settings.cc',
+ 'browser/chromeos/settings/cros_settings.h',
+ 'browser/chromeos/settings/cros_settings_names.cc',
+ 'browser/chromeos/settings/cros_settings_names.h',
+ 'browser/chromeos/settings/cros_settings_provider.cc',
+ 'browser/chromeos/settings/cros_settings_provider.h',
+ 'browser/chromeos/settings/device_settings_provider.cc',
+ 'browser/chromeos/settings/device_settings_provider.h',
+ 'browser/chromeos/settings/owner_key_utils.cc',
+ 'browser/chromeos/settings/owner_key_utils.h',
+ 'browser/chromeos/settings/owner_manager.cc',
+ 'browser/chromeos/settings/owner_manager.h',
+ 'browser/chromeos/settings/ownership_service.cc',
+ 'browser/chromeos/settings/ownership_service.h',
+ 'browser/chromeos/settings/session_manager_observer.cc',
+ 'browser/chromeos/settings/session_manager_observer.h',
+ 'browser/chromeos/settings/signed_settings.cc',
+ 'browser/chromeos/settings/signed_settings.h',
+ 'browser/chromeos/settings/signed_settings_cache.cc',
+ 'browser/chromeos/settings/signed_settings_cache.h',
+ 'browser/chromeos/settings/signed_settings_helper.cc',
+ 'browser/chromeos/settings/signed_settings_helper.h',
+ 'browser/chromeos/settings/signed_settings_migration_helper.cc',
+ 'browser/chromeos/settings/signed_settings_migration_helper.h',
+ 'browser/chromeos/settings/stub_cros_settings_provider.cc',
+ 'browser/chromeos/settings/stub_cros_settings_provider.h',
+ 'browser/chromeos/settings/system_settings_provider.cc',
+ 'browser/chromeos/settings/system_settings_provider.h',
'browser/chromeos/sim_dialog_delegate.cc',
'browser/chromeos/sim_dialog_delegate.h',
'browser/chromeos/sms_observer.cc',
@@ -887,8 +891,6 @@
'browser/chromeos/status/network_menu.h',
'browser/chromeos/status/network_menu_icon.cc',
'browser/chromeos/status/network_menu_icon.h',
- 'browser/chromeos/stub_cros_settings_provider.cc',
- 'browser/chromeos/stub_cros_settings_provider.h',
'browser/chromeos/system/ash_system_tray_delegate.cc',
'browser/chromeos/system/ash_system_tray_delegate.h',
'browser/chromeos/system/drm_settings.cc',
@@ -913,8 +915,6 @@
'browser/chromeos/system/udev_info_provider.h',
'browser/chromeos/system_key_event_listener.cc',
'browser/chromeos/system_key_event_listener.h',
- 'browser/chromeos/system_settings_provider.cc',
- 'browser/chromeos/system_settings_provider.h',
'browser/chromeos/ui/idle_logout_dialog_view.cc',
'browser/chromeos/ui/idle_logout_dialog_view.h',
'browser/chromeos/upgrade_detector_chromeos.cc',
« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/internet_options_handler.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698