summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_webapp_files.gypi
diff options
context:
space:
mode:
authorjrw <jrw@chromium.org>2015-07-21 13:28:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-21 20:29:48 +0000
commit43c0916a502dc87c79e59754b37e79a4fe00acea (patch)
tree0cef8fc8f41826c064f4e4790fa2956d1aa70f9a /remoting/remoting_webapp_files.gypi
parentd67670485f765e7402e52f2efe19cec55e656e2b (diff)
downloadchromium_src-43c0916a502dc87c79e59754b37e79a4fe00acea.zip
chromium_src-43c0916a502dc87c79e59754b37e79a4fe00acea.tar.gz
chromium_src-43c0916a502dc87c79e59754b37e79a4fe00acea.tar.bz2
Added HostListApl implementation to connect to legacy directory and GCD.
The new implementation (CombinedHostListApi) attempts to keep the two directories in sync and present a merged view of the contents of the directories. BUG=503790 Review URL: https://codereview.chromium.org/1217643002 Cr-Commit-Position: refs/heads/master@{#339737}
Diffstat (limited to 'remoting/remoting_webapp_files.gypi')
-rw-r--r--remoting/remoting_webapp_files.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 3b0cb9f..ba60573 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -108,6 +108,7 @@
'webapp/base/js/xmpp_login_handler_unittest.js',
'webapp/base/js/xmpp_stream_parser_unittest.js',
'webapp/crd/js/apps_v2_migration_unittest.js',
+ 'webapp/crd/js/combined_host_list_api_unittest.js',
'webapp/crd/js/gcd_client_unittest.js',
'webapp/crd/js/gcd_client_with_mock_xhr_unittest.js',
'webapp/crd/js/host_controller_unittest.js',
@@ -286,6 +287,7 @@
# JSCompiler. If an implementation of an interface occurs in a
# file processed before the interface itself, the @override tag
# doesn't always work correctly.
+ 'webapp/crd/js/combined_host_list_api.js',
'webapp/crd/js/gcd_host_list_api.js',
'webapp/crd/js/legacy_host_list_api.js',
],