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

Unified Diff: remoting/remoting_webapp_files.gypi

Issue 1161813006: Updated handling of GCD devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: oops--ignore Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/webapp/crd/js/gcd_client.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_webapp_files.gypi
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 258d54115463a2c9f5b69b670ddde34d6f3bb57a..792bd217003806c061df10d7effebedd370050e8 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -102,8 +102,8 @@
'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js',
'webapp/crd/js/host_controller_unittest.js',
'webapp/crd/js/host_daemon_facade_unittest.js',
- 'webapp/crd/js/host_list_api_impl_unittest.js',
'webapp/crd/js/host_table_entry_unittest.js',
+ 'webapp/crd/js/legacy_host_list_api_unittest.js',
'webapp/crd/js/menu_button_unittest.js',
'webapp/crd/js/mock_xhr_unittest.js',
],
@@ -264,10 +264,12 @@
'remoting_webapp_js_host_display_files': [
'webapp/crd/js/host_list.js',
'webapp/crd/js/host_list_api.js',
- 'webapp/crd/js/host_list_api_gcd_impl.js',
- 'webapp/crd/js/host_list_api_impl.js',
'webapp/crd/js/host_table_entry.js',
'webapp/crd/js/local_host_section.js',
+
+ # Must come after host_list_api.js
+ 'webapp/crd/js/gcd_host_list_api.js',
+ 'webapp/crd/js/legacy_host_list_api.js',
],
# The CRD-specific JavaScript files required by main.html.
'remoting_webapp_crd_js_ui_files': [
« no previous file with comments | « no previous file | remoting/webapp/crd/js/gcd_client.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698