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

Unified Diff: chromeos/chromeos.gyp

Issue 10915106: Renaming instances of "flimflam" with "shill", now that we're only (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Upload after merge Created 8 years, 3 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/chromeos/sim_unlock_ui.cc ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 86b56285096f92672fa0fecf3e538511377dd3cc..d9f7c85245335f001fd9ac79ef344c882c12d09a 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -60,20 +60,20 @@
'dbus/debug_daemon_client.h',
'dbus/gsm_sms_client.cc',
'dbus/gsm_sms_client.h',
- 'dbus/flimflam_ipconfig_client.cc',
- 'dbus/flimflam_ipconfig_client.h',
- 'dbus/flimflam_client_helper.cc',
- 'dbus/flimflam_client_helper.h',
- 'dbus/flimflam_device_client.cc',
- 'dbus/flimflam_device_client.h',
- 'dbus/flimflam_manager_client.cc',
- 'dbus/flimflam_manager_client.h',
- 'dbus/flimflam_network_client.cc',
- 'dbus/flimflam_network_client.h',
- 'dbus/flimflam_profile_client.cc',
- 'dbus/flimflam_profile_client.h',
- 'dbus/flimflam_service_client.cc',
- 'dbus/flimflam_service_client.h',
+ 'dbus/shill_ipconfig_client.cc',
+ 'dbus/shill_ipconfig_client.h',
+ 'dbus/shill_client_helper.cc',
+ 'dbus/shill_client_helper.h',
+ 'dbus/shill_device_client.cc',
+ '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',
+ 'dbus/shill_service_client.h',
'dbus/ibus/ibus_client.cc',
'dbus/ibus/ibus_client.h',
'dbus/ibus/ibus_component.cc',
@@ -162,18 +162,18 @@
'dbus/mock_dbus_thread_manager.h',
'dbus/mock_debug_daemon_client.cc',
'dbus/mock_debug_daemon_client.h',
- 'dbus/mock_flimflam_device_client.cc',
- 'dbus/mock_flimflam_device_client.h',
- 'dbus/mock_flimflam_ipconfig_client.cc',
- 'dbus/mock_flimflam_ipconfig_client.h',
- 'dbus/mock_flimflam_manager_client.cc',
- 'dbus/mock_flimflam_manager_client.h',
- 'dbus/mock_flimflam_network_client.cc',
- 'dbus/mock_flimflam_network_client.h',
- 'dbus/mock_flimflam_profile_client.cc',
- 'dbus/mock_flimflam_profile_client.h',
- 'dbus/mock_flimflam_service_client.cc',
- 'dbus/mock_flimflam_service_client.h',
+ 'dbus/mock_shill_device_client.cc',
+ 'dbus/mock_shill_device_client.h',
+ 'dbus/mock_shill_ipconfig_client.cc',
+ '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',
+ 'dbus/mock_shill_service_client.h',
'dbus/mock_gsm_sms_client.cc',
'dbus/mock_gsm_sms_client.h',
'dbus/mock_image_burner_client.cc',
@@ -240,14 +240,14 @@
],
'sources': [
'dbus/blocking_method_caller_unittest.cc',
- 'dbus/flimflam_client_unittest_base.cc',
- 'dbus/flimflam_client_unittest_base.h',
- 'dbus/flimflam_device_client_unittest.cc',
- 'dbus/flimflam_ipconfig_client_unittest.cc',
- 'dbus/flimflam_manager_client_unittest.cc',
- 'dbus/flimflam_network_client_unittest.cc',
- 'dbus/flimflam_profile_client_unittest.cc',
- 'dbus/flimflam_service_client_unittest.cc',
+ 'dbus/shill_client_unittest_base.cc',
+ 'dbus/shill_client_unittest_base.h',
+ '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',
'dbus/ibus/ibus_client_unittest.cc',
'dbus/ibus/ibus_component_unittest.cc',
« no previous file with comments | « chrome/browser/ui/webui/chromeos/sim_unlock_ui.cc ('k') | chromeos/dbus/dbus_thread_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698