diff options
| author | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 09:20:03 +0000 |
|---|---|---|
| committer | dubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-15 09:20:03 +0000 |
| commit | d402bd052841a261123e0f1bd658b5b4aa0097b7 (patch) | |
| tree | 613cc3879406a60c90a8d0de4bfe7da26ed86f5a /chromeos/chromeos.gyp | |
| parent | 8ce5d3f82dbe352f587e7b586b07e1c4f9697349 (diff) | |
| download | chromium_src-d402bd052841a261123e0f1bd658b5b4aa0097b7.zip chromium_src-d402bd052841a261123e0f1bd658b5b4aa0097b7.tar.gz chromium_src-d402bd052841a261123e0f1bd658b5b4aa0097b7.tar.bz2 | |
Revert 176858
> Deprecate ShillNetworkClient and add GeolocationHandler
>
> Shill deprecated Manager.Network which was being used to get wifi access point data.
> This eliminates the dead code and adds GeolocationHandler which currently queries Shill.Manager for geolocation data, and caches and returns the result.
>
> BUG=167987
> For chrome/browser/geolocation:
> TBR=joth@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/11887008
TBR=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/11879038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/chromeos.gyp')
| -rw-r--r-- | chromeos/chromeos.gyp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index e9e5848..61ca41a 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -69,6 +69,8 @@ 'dbus/shill_device_client.h', 'dbus/shill_manager_client.cc', 'dbus/shill_manager_client.h', + 'dbus/shill_network_client.cc', + 'dbus/shill_network_client.h', 'dbus/shill_profile_client.cc', 'dbus/shill_profile_client.h', 'dbus/shill_service_client.cc', @@ -127,8 +129,6 @@ 'network/cros_network_functions.h', 'network/device_state.cc', 'network/device_state.h', - 'network/geolocation_handler.cc', - 'network/geolocation_handler.h', 'network/managed_state.cc', 'network/managed_state.h', 'network/network_change_notifier_chromeos.cc', @@ -155,6 +155,8 @@ 'network/network_state_handler_observer.h', 'network/network_util.cc', 'network/network_util.h', + 'network/sms_watcher.cc', + 'network/sms_watcher.h', 'network/onc/onc_certificate_importer.cc', 'network/onc/onc_certificate_importer.h', 'network/onc/onc_constants.cc', @@ -180,8 +182,6 @@ 'network/shill_property_handler.h', 'network/shill_service_observer.cc', 'network/shill_service_observer.h', - 'network/sms_watcher.cc', - 'network/sms_watcher.h', 'power/power_state_override.cc', 'power/power_state_override.h', ], @@ -232,6 +232,8 @@ 'dbus/mock_shill_ipconfig_client.h', 'dbus/mock_shill_manager_client.cc', 'dbus/mock_shill_manager_client.h', + 'dbus/mock_shill_network_client.cc', + 'dbus/mock_shill_network_client.h', 'dbus/mock_shill_profile_client.cc', 'dbus/mock_shill_profile_client.h', 'dbus/mock_shill_service_client.cc', @@ -317,6 +319,7 @@ 'dbus/shill_device_client_unittest.cc', 'dbus/shill_ipconfig_client_unittest.cc', 'dbus/shill_manager_client_unittest.cc', + 'dbus/shill_network_client_unittest.cc', 'dbus/shill_profile_client_unittest.cc', 'dbus/shill_service_client_unittest.cc', 'dbus/gsm_sms_client_unittest.cc', @@ -335,7 +338,6 @@ 'dbus/modem_messaging_client_unittest.cc', 'disks/disk_mount_manager_unittest.cc', 'network/cros_network_functions_unittest.cc', - 'network/geolocation_handler_unittest.cc', 'network/network_change_notifier_chromeos_unittest.cc', 'network/network_configuration_handler_unittest.cc', 'network/network_device_handler_unittest.cc', |