[Chromoting] Move webapp files based on new directory structure:

remoting/webapp/crd/html       -- CRD-specific HTML/CSS
remoting/webapp/crd/js         -- CRD-specific JS
remoting/webapp/crd/resources  -- CRD-specific resources

remoting/webapp/base/html      -- common HTML/CSS
remoting/webapp/base/js        -- common JS
remoting/webapp/base/resources -- common resources

The only content changes are in the GYP/GYPI files and in template_main.html. These files needed to be updated to use the new file paths.

BUG=
R=jamiewalch@chromium.org

Review URL: https://codereview.chromium.org/671513008

Cr-Commit-Position: refs/heads/master@{#300806}

120 files changed, 164 insertions, 164 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 335c544..638135e 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -170,19 +170,19 @@
           'host/win/host_messages.mc.jinja2',
           'host/win/version.rc.jinja2',
           'resources/play_store_resources.cc',
-          'webapp/background/background.js',
-          'webapp/background/it2me_helpee_channel.js',
-          'webapp/butter_bar.js',
-          'webapp/client_screen.js',
-          'webapp/error.js',
-          'webapp/host_list.js',
-          'webapp/host_setup_dialog.js',
-          'webapp/host_table_entry.js',
-          'webapp/options_menu.js',
-          'webapp/manifest.json.jinja2',
-          'webapp/paired_client_manager.js',
-          'webapp/remoting.js',
-          'webapp/window_frame.js',
+          'webapp/crd/js/background.js',
+          'webapp/crd/js/butter_bar.js',
+          'webapp/crd/js/client_screen.js',
+          'webapp/crd/js/error.js',
+          'webapp/crd/js/host_list.js',
+          'webapp/crd/js/host_setup_dialog.js',
+          'webapp/crd/js/host_table_entry.js',
+          'webapp/crd/js/it2me_helpee_channel.js',
+          'webapp/crd/js/options_menu.js',
+          'webapp/crd/js/paired_client_manager.js',
+          'webapp/crd/js/remoting.js',
+          'webapp/crd/js/window_frame.js',
+          'webapp/crd/manifest.json.jinja2',
         ],
       },
       'actions': [
diff --git a/remoting/remoting_client.gypi b/remoting/remoting_client.gypi
index ea513d5..786389a 100644
--- a/remoting/remoting_client.gypi
+++ b/remoting/remoting_client.gypi
@@ -142,7 +142,7 @@
           'variables': {
             'webapp_type': 'v2_pnacl',
             'extra_files': [
-              'webapp/remoting_client_pnacl.nmf',
+              'webapp/crd/remoting_client_pnacl.nmf',
               '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
             ],
           },
diff --git a/remoting/remoting_webapp.gypi b/remoting/remoting_webapp.gypi
index b5ea119..57d0c36 100644
--- a/remoting/remoting_webapp.gypi
+++ b/remoting/remoting_webapp.gypi
@@ -48,7 +48,7 @@
       'action_name': 'Build Remoting WebApp',
       'inputs': [
         'webapp/build-webapp.py',
-        'webapp/manifest.json.jinja2',
+        'webapp/crd/manifest.json.jinja2',
         '<(chrome_version_path)',
         '<(remoting_version_path)',
         '<@(generated_html_files)',
@@ -66,7 +66,7 @@
         '<(version_full)',
         '<(output_dir)',
         '<(zip_path)',
-        'webapp/manifest.json.jinja2',
+        'webapp/crd/manifest.json.jinja2',
         '<(webapp_type)',
         '<@(generated_html_files)',
         '<@(remoting_webapp_files)',
diff --git a/remoting/remoting_webapp_files.gypi b/remoting/remoting_webapp_files.gypi
index 6ab3afe..179ca45 100644
--- a/remoting/remoting_webapp_files.gypi
+++ b/remoting/remoting_webapp_files.gypi
@@ -23,117 +23,117 @@
     # These files aren't included directly from main.html. They are
     # referenced from the manifest.json file (appsv1 only).
     'remoting_webapp_js_auth_v1_files': [
-      'webapp/cs_third_party_auth_trampoline.js',  # client to host
-      'webapp/cs_oauth2_trampoline.js',  # Google account
+      'webapp/crd/js/cs_third_party_auth_trampoline.js',  # client to host
+      'webapp/crd/js/cs_oauth2_trampoline.js',  # Google account
     ],
     # Auth (client to host) JavaScript files.
     'remoting_webapp_js_auth_client2host_files': [
-      'webapp/third_party_host_permissions.js',
-      'webapp/third_party_token_fetcher.js',
+      'webapp/crd/js/third_party_host_permissions.js',
+      'webapp/crd/js/third_party_token_fetcher.js',
     ],
     # Auth (Google account) JavaScript files.
     'remoting_webapp_js_auth_google_files': [
-      'webapp/identity.js',
-      'webapp/oauth2.js',
-      'webapp/oauth2_api.js',
+      'webapp/crd/js/identity.js',
+      'webapp/crd/js/oauth2.js',
+      'webapp/crd/js/oauth2_api.js',
     ],
     # Client JavaScript files.
     'remoting_webapp_js_client_files': [
-      'webapp/client_plugin.js',
-      'webapp/client_plugin_impl.js',
+      'webapp/crd/js/client_plugin.js',
+      'webapp/crd/js/client_plugin_impl.js',
       # TODO(garykac) For client_screen:
       # * Split out pin/access code stuff into separate file.
       # * Move client logic into session_connector
-      'webapp/client_screen.js',
-      'webapp/client_session.js',
-      'webapp/clipboard.js',
-      'webapp/hangout_session.js',
-      'webapp/media_source_renderer.js',
-      'webapp/session_connector.js',
-      'webapp/session_connector_impl.js',
-      'webapp/smart_reconnector.js',
-      'webapp/video_frame_recorder.js',
+      'webapp/crd/js/client_screen.js',
+      'webapp/crd/js/client_session.js',
+      'webapp/crd/js/clipboard.js',
+      'webapp/crd/js/hangout_session.js',
+      'webapp/crd/js/media_source_renderer.js',
+      'webapp/crd/js/session_connector.js',
+      'webapp/crd/js/session_connector_impl.js',
+      'webapp/crd/js/smart_reconnector.js',
+      'webapp/crd/js/video_frame_recorder.js',
     ],
     # Remoting core JavaScript files.
     'remoting_webapp_js_core_files': [
-      'webapp/base.js',
-      'webapp/error.js',
-      'webapp/event_handlers.js',
-      'webapp/platform.js',
-      'webapp/plugin_settings.js',
+      'webapp/base/js/base.js',
+      'webapp/base/js/platform.js',
+      'webapp/crd/js/error.js',
+      'webapp/crd/js/event_handlers.js',
+      'webapp/crd/js/plugin_settings.js',
       # TODO(garykac) Split out UI client stuff from remoting.js.
-      'webapp/remoting.js',
-      'webapp/typecheck.js',
-      'webapp/xhr.js',
+      'webapp/crd/js/remoting.js',
+      'webapp/crd/js/typecheck.js',
+      'webapp/crd/js/xhr.js',
     ],
     # Host JavaScript files.
     # Includes both it2me and me2me files.
     'remoting_webapp_js_host_files': [
-      'webapp/host_controller.js',
-      'webapp/host_daemon_facade.js',
-      'webapp/it2me_host_facade.js',
-      'webapp/host_session.js',
+      'webapp/crd/js/host_controller.js',
+      'webapp/crd/js/host_daemon_facade.js',
+      'webapp/crd/js/it2me_host_facade.js',
+      'webapp/crd/js/host_session.js',
     ],
     # Logging and stats JavaScript files.
     'remoting_webapp_js_logging_files': [
-      'webapp/format_iq.js',
-      'webapp/log_to_server.js',
-      'webapp/server_log_entry.js',
-      'webapp/stats_accumulator.js',
+      'webapp/crd/js/format_iq.js',
+      'webapp/crd/js/log_to_server.js',
+      'webapp/crd/js/server_log_entry.js',
+      'webapp/crd/js/stats_accumulator.js',
     ],
     # UI JavaScript files.
     'remoting_webapp_js_ui_files': [
-      'webapp/butter_bar.js',
-      'webapp/connection_stats.js',
-      'webapp/feedback.js',
-      'webapp/fullscreen.js',
-      'webapp/fullscreen_v1.js',
-      'webapp/fullscreen_v2.js',
-      'webapp/l10n.js',
-      'webapp/menu_button.js',
-      'webapp/options_menu.js',
-      'webapp/ui_mode.js',
-      'webapp/toolbar.js',
-      'webapp/window_frame.js',
+      'webapp/crd/js/butter_bar.js',
+      'webapp/crd/js/connection_stats.js',
+      'webapp/crd/js/feedback.js',
+      'webapp/crd/js/fullscreen.js',
+      'webapp/crd/js/fullscreen_v1.js',
+      'webapp/crd/js/fullscreen_v2.js',
+      'webapp/crd/js/l10n.js',
+      'webapp/crd/js/menu_button.js',
+      'webapp/crd/js/options_menu.js',
+      'webapp/crd/js/ui_mode.js',
+      'webapp/crd/js/toolbar.js',
+      'webapp/crd/js/window_frame.js',
     ],
     # UI files for controlling the local machine as a host.
     'remoting_webapp_js_ui_host_control_files': [
-      'webapp/host_screen.js',
-      'webapp/host_setup_dialog.js',
-      'webapp/host_install_dialog.js',
-      'webapp/host_installer.js',
-      'webapp/paired_client_manager.js',
+      'webapp/crd/js/host_screen.js',
+      'webapp/crd/js/host_setup_dialog.js',
+      'webapp/crd/js/host_install_dialog.js',
+      'webapp/crd/js/host_installer.js',
+      'webapp/crd/js/paired_client_manager.js',
     ],
     # UI files for displaying (in the client) info about available hosts.
     'remoting_webapp_js_ui_host_display_files': [
-      'webapp/host.js',
-      'webapp/host_list.js',
-      'webapp/host_settings.js',
-      'webapp/host_table_entry.js',
+      'webapp/crd/js/host.js',
+      'webapp/crd/js/host_list.js',
+      'webapp/crd/js/host_settings.js',
+      'webapp/crd/js/host_table_entry.js',
     ],
     # Remoting signaling files.
     'remoting_webapp_js_signaling_files': [
-      'webapp/signal_strategy.js',
-      'webapp/wcs_adapter.js',
-      'webapp/wcs_sandbox_container.js',
-      'webapp/xmpp_connection.js',
-      'webapp/xmpp_login_handler.js',
-      'webapp/xmpp_stream_parser.js',
+      'webapp/crd/js/signal_strategy.js',
+      'webapp/crd/js/wcs_adapter.js',
+      'webapp/crd/js/wcs_sandbox_container.js',
+      'webapp/crd/js/xmpp_connection.js',
+      'webapp/crd/js/xmpp_login_handler.js',
+      'webapp/crd/js/xmpp_stream_parser.js',
     ],
     # Remoting WCS sandbox JavaScript files.
     'remoting_webapp_js_wcs_sandbox_files': [
-      'webapp/wcs.js',
-      'webapp/wcs_loader.js',
-      'webapp/wcs_sandbox_content.js',
-      'webapp/xhr_proxy.js',
+      'webapp/crd/js/wcs.js',
+      'webapp/crd/js/wcs_loader.js',
+      'webapp/crd/js/wcs_sandbox_content.js',
+      'webapp/crd/js/xhr_proxy.js',
     ],
     # gnubby authentication JavaScript files.
     'remoting_webapp_js_gnubby_auth_files': [
-      'webapp/gnubby_auth_handler.js',
+      'webapp/crd/js/gnubby_auth_handler.js',
     ],
     # cast extension handler JavaScript files.
     'remoting_webapp_js_cast_extension_files': [
-      'webapp/cast_extension_handler.js',
+      'webapp/crd/js/cast_extension_handler.js',
     ],
     # browser test JavaScript files.
     'remoting_webapp_js_browser_test_files': [
@@ -151,10 +151,10 @@
     'remoting_webapp_unittest_exclude_files': [
       # background.js is where the onLoad handler is defined, which
       # makes it the entry point of the background page.
-      'webapp/background/background.js',
+      'webapp/crd/js/background.js',
       # event_handlers.js is where the onLoad handler is defined, which
       # makes it the entry point of the webapp.
-      'webapp/event_handlers.js',
+      'webapp/crd/js/event_handlers.js',
     ],
     # The unit test cases for the webapp
     'remoting_webapp_unittest_js_files': [
@@ -171,10 +171,10 @@
       'webapp/unittests/xmpp_stream_parser_unittest.js',
     ],
     'remoting_webapp_unittest_additional_files': [
-      'webapp/menu_button.css',
+      'webapp/crd/html/menu_button.css',
     ],
     'remoting_webapp_unittest_template_main':
-      'webapp/html/template_unittest.html',
+      'webapp/crd/html/template_unittest.html',
 
     # The JavaScript files required by main.html.
     'remoting_webapp_main_html_js_files': [
@@ -199,29 +199,29 @@
 
     # The JavaScript files that are used in the background page.
     'remoting_webapp_background_js_files': [
-      'webapp/base.js',
-      'webapp/client_session.js',
-      'webapp/error.js',
-      'webapp/host_installer.js',
-      'webapp/host_session.js',
-      'webapp/it2me_host_facade.js',
-      'webapp/l10n.js',
-      'webapp/plugin_settings.js',
-      'webapp/typecheck.js',
-      'webapp/background/app_launcher.js',
-      'webapp/background/background.js',
-      'webapp/background/it2me_helpee_channel.js',
-      'webapp/background/it2me_helper_channel.js',
-      'webapp/background/it2me_service.js',
-      'webapp/background/message_window_helper.js',
-      'webapp/background/message_window_manager.js',
+      'webapp/base/js/base.js',
+      'webapp/base/js/message_window_helper.js',
+      'webapp/base/js/message_window_manager.js',
+      'webapp/crd/js/app_launcher.js',
+      'webapp/crd/js/background.js',
+      'webapp/crd/js/client_session.js',
+      'webapp/crd/js/error.js',
+      'webapp/crd/js/host_installer.js',
+      'webapp/crd/js/host_session.js',
+      'webapp/crd/js/it2me_helpee_channel.js',
+      'webapp/crd/js/it2me_helper_channel.js',
+      'webapp/crd/js/it2me_host_facade.js',
+      'webapp/crd/js/it2me_service.js',
+      'webapp/crd/js/l10n.js',
+      'webapp/crd/js/plugin_settings.js',
+      'webapp/crd/js/typecheck.js',
     ],
 
     # The JavaScript files required by wcs_sandbox.html.
     'remoting_webapp_wcs_sandbox_html_js_files': [
       '<@(remoting_webapp_js_wcs_sandbox_files)',
-      'webapp/error.js',
-      'webapp/plugin_settings.js',
+      'webapp/crd/js/error.js',
+      'webapp/crd/js/plugin_settings.js',
     ],
 
     # All the JavaScript files required by the webapp.
@@ -230,7 +230,7 @@
       '<@(remoting_webapp_main_html_js_files)',
       '<@(remoting_webapp_background_js_files)',
       # JS files for message_window.html
-      'webapp/background/message_window.js',
+      'webapp/base/js/message_window.js',
       # JS files for wcs_sandbox.html.
       # Use r_w_js_wcs_sandbox_files instead of r_w_wcs_sandbox_html_js_files
       # so that we don't double include error.js and plugin_settings.js.
@@ -260,17 +260,17 @@
       'resources/plus.webp',
       'resources/reload.webp',
       'resources/tick.webp',
-      'webapp/connection_stats.css',
-      'webapp/html/message_window.html',
-      'webapp/main.css',
-      'webapp/menu_button.css',
-      'webapp/message_window.css',
-      'webapp/open_sans.css',
-      'webapp/open_sans.woff',
-      'webapp/scale-to-fit.webp',
-      'webapp/spinner.gif',
-      'webapp/toolbar.css',
-      'webapp/window_frame.css',
+      'webapp/base/html/connection_stats.css',
+      'webapp/base/html/message_window.html',
+      'webapp/base/html/main.css',
+      'webapp/base/html/message_window.css',
+      'webapp/base/resources/open_sans.css',
+      'webapp/base/resources/open_sans.woff',
+      'webapp/base/resources/spinner.gif',
+      'webapp/crd/html/toolbar.css',
+      'webapp/crd/html/menu_button.css',
+      'webapp/crd/html/window_frame.css',
+      'webapp/crd/resources/scale-to-fit.webp',
     ],
 
     'remoting_webapp_files': [
@@ -281,37 +281,37 @@
 
     # These template files are used to construct the webapp html files.
     'remoting_webapp_template_main':
-      'webapp/html/template_main.html',
+      'webapp/crd/html/template_main.html',
 
     'remoting_webapp_template_wcs_sandbox':
-      'webapp/html/template_wcs_sandbox.html',
+      'webapp/base/html/template_wcs_sandbox.html',
 
     'remoting_webapp_template_background':
-      'webapp/html/template_background.html',
+      'webapp/crd/html/template_background.html',
 
     'remoting_webapp_template_files': [
-      'webapp/html/butterbar.html',
-      'webapp/html/client_plugin.html',
-      'webapp/html/dialog_auth.html',
-      'webapp/html/dialog_client_connect_failed.html',
-      'webapp/html/dialog_client_connecting.html',
-      'webapp/html/dialog_client_host_needs_upgrade.html',
-      'webapp/html/dialog_client_pin_prompt.html',
-      'webapp/html/dialog_client_session_finished.html',
-      'webapp/html/dialog_client_third_party_auth.html',
-      'webapp/html/dialog_client_unconnected.html',
-      'webapp/html/dialog_confirm_host_delete.html',
-      'webapp/html/dialog_connection_history.html',
-      'webapp/html/dialog_host.html',
-      'webapp/html/dialog_host_install.html',
-      'webapp/html/dialog_host_setup.html',
-      'webapp/html/dialog_manage_pairings.html',
-      'webapp/html/dialog_token_refresh_failed.html',
-      'webapp/html/toolbar.html',
-      'webapp/html/ui_header.html',
-      'webapp/html/ui_it2me.html',
-      'webapp/html/ui_me2me.html',
-      'webapp/html/window_frame.html',
+      'webapp/base/html/client_plugin.html',
+      'webapp/base/html/dialog_auth.html',
+      'webapp/crd/html/butterbar.html',
+      'webapp/crd/html/dialog_client_connect_failed.html',
+      'webapp/crd/html/dialog_client_connecting.html',
+      'webapp/crd/html/dialog_client_host_needs_upgrade.html',
+      'webapp/crd/html/dialog_client_pin_prompt.html',
+      'webapp/crd/html/dialog_client_session_finished.html',
+      'webapp/crd/html/dialog_client_third_party_auth.html',
+      'webapp/crd/html/dialog_client_unconnected.html',
+      'webapp/crd/html/dialog_confirm_host_delete.html',
+      'webapp/crd/html/dialog_connection_history.html',
+      'webapp/crd/html/dialog_host.html',
+      'webapp/crd/html/dialog_host_install.html',
+      'webapp/crd/html/dialog_host_setup.html',
+      'webapp/crd/html/dialog_manage_pairings.html',
+      'webapp/crd/html/dialog_token_refresh_failed.html',
+      'webapp/crd/html/toolbar.html',
+      'webapp/crd/html/ui_header.html',
+      'webapp/crd/html/ui_it2me.html',
+      'webapp/crd/html/ui_me2me.html',
+      'webapp/crd/html/window_frame.html',
     ],
 
   },
diff --git a/remoting/webapp/html/client_plugin.html b/remoting/webapp/base/html/client_plugin.html
index 11df9c4..11df9c4 100644
--- a/remoting/webapp/html/client_plugin.html
+++ b/remoting/webapp/base/html/client_plugin.html
diff --git a/remoting/webapp/connection_stats.css b/remoting/webapp/base/html/connection_stats.css
index ffcf784..ffcf784 100644
--- a/remoting/webapp/connection_stats.css
+++ b/remoting/webapp/base/html/connection_stats.css
diff --git a/remoting/webapp/html/dialog_auth.html b/remoting/webapp/base/html/dialog_auth.html
index b57e5a5..b57e5a5 100644
--- a/remoting/webapp/html/dialog_auth.html
+++ b/remoting/webapp/base/html/dialog_auth.html
diff --git a/remoting/webapp/main.css b/remoting/webapp/base/html/main.css
index d1ffd11..d1ffd11 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/base/html/main.css
diff --git a/remoting/webapp/message_window.css b/remoting/webapp/base/html/message_window.css
index a053df3..a053df3 100644
--- a/remoting/webapp/message_window.css
+++ b/remoting/webapp/base/html/message_window.css
diff --git a/remoting/webapp/html/message_window.html b/remoting/webapp/base/html/message_window.html
index 2e7074b..2e7074b 100644
--- a/remoting/webapp/html/message_window.html
+++ b/remoting/webapp/base/html/message_window.html
diff --git a/remoting/webapp/html/template_wcs_sandbox.html b/remoting/webapp/base/html/template_wcs_sandbox.html
index 11916ae..11916ae 100644
--- a/remoting/webapp/html/template_wcs_sandbox.html
+++ b/remoting/webapp/base/html/template_wcs_sandbox.html
diff --git a/remoting/webapp/base.js b/remoting/webapp/base/js/base.js
index ee909be..ee909be 100644
--- a/remoting/webapp/base.js
+++ b/remoting/webapp/base/js/base.js
diff --git a/remoting/webapp/background/message_window.js b/remoting/webapp/base/js/message_window.js
index a57684a..a57684a 100644
--- a/remoting/webapp/background/message_window.js
+++ b/remoting/webapp/base/js/message_window.js
diff --git a/remoting/webapp/background/message_window_helper.js b/remoting/webapp/base/js/message_window_helper.js
index cbc379e..cbc379e 100644
--- a/remoting/webapp/background/message_window_helper.js
+++ b/remoting/webapp/base/js/message_window_helper.js
diff --git a/remoting/webapp/background/message_window_manager.js b/remoting/webapp/base/js/message_window_manager.js
index 39962c7..39962c7 100644
--- a/remoting/webapp/background/message_window_manager.js
+++ b/remoting/webapp/base/js/message_window_manager.js
diff --git a/remoting/webapp/platform.js b/remoting/webapp/base/js/platform.js
index ab01cc7..ab01cc7 100644
--- a/remoting/webapp/platform.js
+++ b/remoting/webapp/base/js/platform.js
diff --git a/remoting/webapp/open_sans.css b/remoting/webapp/base/resources/open_sans.css
index a5d71f2..a5d71f2 100644
--- a/remoting/webapp/open_sans.css
+++ b/remoting/webapp/base/resources/open_sans.css
diff --git a/remoting/webapp/open_sans.woff b/remoting/webapp/base/resources/open_sans.woff
index 55b25f8..55b25f8 100644
--- a/remoting/webapp/open_sans.woff
+++ b/remoting/webapp/base/resources/open_sans.woff
diff --git a/remoting/webapp/spinner.gif b/remoting/webapp/base/resources/spinner.gif
index b0c07cb..b0c07cb 100644
--- a/remoting/webapp/spinner.gif
+++ b/remoting/webapp/base/resources/spinner.gif
diff --git a/remoting/webapp/html/butterbar.html b/remoting/webapp/crd/html/butterbar.html
index 7417508..7417508 100644
--- a/remoting/webapp/html/butterbar.html
+++ b/remoting/webapp/crd/html/butterbar.html
diff --git a/remoting/webapp/html/dialog_client_connect_failed.html b/remoting/webapp/crd/html/dialog_client_connect_failed.html
index 18e00f3..18e00f3 100644
--- a/remoting/webapp/html/dialog_client_connect_failed.html
+++ b/remoting/webapp/crd/html/dialog_client_connect_failed.html
diff --git a/remoting/webapp/html/dialog_client_connecting.html b/remoting/webapp/crd/html/dialog_client_connecting.html
index ef38881..ef38881 100644
--- a/remoting/webapp/html/dialog_client_connecting.html
+++ b/remoting/webapp/crd/html/dialog_client_connecting.html
diff --git a/remoting/webapp/html/dialog_client_host_needs_upgrade.html b/remoting/webapp/crd/html/dialog_client_host_needs_upgrade.html
index abcdcd3..abcdcd3 100644
--- a/remoting/webapp/html/dialog_client_host_needs_upgrade.html
+++ b/remoting/webapp/crd/html/dialog_client_host_needs_upgrade.html
diff --git a/remoting/webapp/html/dialog_client_pin_prompt.html b/remoting/webapp/crd/html/dialog_client_pin_prompt.html
index 992b1e9..992b1e9 100644
--- a/remoting/webapp/html/dialog_client_pin_prompt.html
+++ b/remoting/webapp/crd/html/dialog_client_pin_prompt.html
diff --git a/remoting/webapp/html/dialog_client_session_finished.html b/remoting/webapp/crd/html/dialog_client_session_finished.html
index 1ad126a..1ad126a 100644
--- a/remoting/webapp/html/dialog_client_session_finished.html
+++ b/remoting/webapp/crd/html/dialog_client_session_finished.html
diff --git a/remoting/webapp/html/dialog_client_third_party_auth.html b/remoting/webapp/crd/html/dialog_client_third_party_auth.html
index 8e3eb82..8e3eb82 100644
--- a/remoting/webapp/html/dialog_client_third_party_auth.html
+++ b/remoting/webapp/crd/html/dialog_client_third_party_auth.html
diff --git a/remoting/webapp/html/dialog_client_unconnected.html b/remoting/webapp/crd/html/dialog_client_unconnected.html
index fa91bca..fa91bca 100644
--- a/remoting/webapp/html/dialog_client_unconnected.html
+++ b/remoting/webapp/crd/html/dialog_client_unconnected.html
diff --git a/remoting/webapp/html/dialog_confirm_host_delete.html b/remoting/webapp/crd/html/dialog_confirm_host_delete.html
index d3eb491..d3eb491 100644
--- a/remoting/webapp/html/dialog_confirm_host_delete.html
+++ b/remoting/webapp/crd/html/dialog_confirm_host_delete.html
diff --git a/remoting/webapp/html/dialog_connection_history.html b/remoting/webapp/crd/html/dialog_connection_history.html
index 63796cf..63796cf 100644
--- a/remoting/webapp/html/dialog_connection_history.html
+++ b/remoting/webapp/crd/html/dialog_connection_history.html
diff --git a/remoting/webapp/html/dialog_host.html b/remoting/webapp/crd/html/dialog_host.html
index 7e05472..7e05472 100644
--- a/remoting/webapp/html/dialog_host.html
+++ b/remoting/webapp/crd/html/dialog_host.html
diff --git a/remoting/webapp/html/dialog_host_install.html b/remoting/webapp/crd/html/dialog_host_install.html
index 5ef87b9..5ef87b9 100644
--- a/remoting/webapp/html/dialog_host_install.html
+++ b/remoting/webapp/crd/html/dialog_host_install.html
diff --git a/remoting/webapp/html/dialog_host_setup.html b/remoting/webapp/crd/html/dialog_host_setup.html
index 48e6a20..48e6a20 100644
--- a/remoting/webapp/html/dialog_host_setup.html
+++ b/remoting/webapp/crd/html/dialog_host_setup.html
diff --git a/remoting/webapp/html/dialog_manage_pairings.html b/remoting/webapp/crd/html/dialog_manage_pairings.html
index bdead44..bdead44 100644
--- a/remoting/webapp/html/dialog_manage_pairings.html
+++ b/remoting/webapp/crd/html/dialog_manage_pairings.html
diff --git a/remoting/webapp/html/dialog_token_refresh_failed.html b/remoting/webapp/crd/html/dialog_token_refresh_failed.html
index 016823c..016823c 100644
--- a/remoting/webapp/html/dialog_token_refresh_failed.html
+++ b/remoting/webapp/crd/html/dialog_token_refresh_failed.html
diff --git a/remoting/webapp/menu_button.css b/remoting/webapp/crd/html/menu_button.css
index 7f88f66..7f88f66 100644
--- a/remoting/webapp/menu_button.css
+++ b/remoting/webapp/crd/html/menu_button.css
diff --git a/remoting/webapp/html/template_background.html b/remoting/webapp/crd/html/template_background.html
index c9d416b..c9d416b 100644
--- a/remoting/webapp/html/template_background.html
+++ b/remoting/webapp/crd/html/template_background.html
diff --git a/remoting/webapp/html/template_main.html b/remoting/webapp/crd/html/template_main.html
index b468339..2ba4d04 100644
--- a/remoting/webapp/html/template_main.html
+++ b/remoting/webapp/crd/html/template_main.html
@@ -23,7 +23,7 @@ found in the LICENSE file.
 
   <body class="full-height">
 
-    <meta-include src="webapp/html/window_frame.html"/>
+    <meta-include src="webapp/crd/html/window_frame.html"/>
 
     <div class="window-body full-height">
 
@@ -44,10 +44,10 @@ found in the LICENSE file.
              data-ui-mode="home"
              hidden>
 
-          <meta-include src="webapp/html/ui_header.html"/>
-          <meta-include src="webapp/html/butterbar.html"/>
-          <meta-include src="webapp/html/ui_it2me.html"/>
-          <meta-include src="webapp/html/ui_me2me.html"/>
+          <meta-include src="webapp/crd/html/ui_header.html"/>
+          <meta-include src="webapp/crd/html/butterbar.html"/>
+          <meta-include src="webapp/crd/html/ui_it2me.html"/>
+          <meta-include src="webapp/crd/html/ui_me2me.html"/>
 
           <!-- The bottom-marker div is used to verify scroll-bar correctness
                in browser tests; it is not rendered. -->
@@ -60,8 +60,8 @@ found in the LICENSE file.
              class="full-height"
              hidden>
 
-          <meta-include src="webapp/html/toolbar.html"/>
-          <meta-include src="webapp/html/client_plugin.html"/>
+          <meta-include src="webapp/crd/html/toolbar.html"/>
+          <meta-include src="webapp/base/html/client_plugin.html"/>
 
         </div>  <!-- session-mode -->
 
@@ -70,7 +70,7 @@ found in the LICENSE file.
 
       </div>  <!-- scroller -->
 
-      <meta-include src="webapp/html/dialog_auth.html"/>
+      <meta-include src="webapp/base/html/dialog_auth.html"/>
 
       <div class="dialog-screen"
            data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-setup home.token-refresh-failed home.manage-pairings home.host-setup home.host-install"
@@ -80,27 +80,27 @@ found in the LICENSE file.
            data-ui-mode="home.host home.client home.history home.confirm-host-delete home.host-install home.host-setup home.token-refresh-failed home.manage-pairings"
            hidden>
 
-        <meta-include src="webapp/html/dialog_token_refresh_failed.html"/>
-        <meta-include src="webapp/html/dialog_host_setup.html"/>
-        <meta-include src="webapp/html/dialog_host_install.html"/>
-        <meta-include src="webapp/html/dialog_host.html"/>
+        <meta-include src="webapp/crd/html/dialog_token_refresh_failed.html"/>
+        <meta-include src="webapp/crd/html/dialog_host_setup.html"/>
+        <meta-include src="webapp/crd/html/dialog_host_install.html"/>
+        <meta-include src="webapp/crd/html/dialog_host.html"/>
 
         <div id="client-dialog"
              class="kd-modaldialog"
              data-ui-mode="home.client">
 
-          <meta-include src="webapp/html/dialog_client_unconnected.html"/>
-          <meta-include src="webapp/html/dialog_client_connecting.html"/>
-          <meta-include src="webapp/html/dialog_client_host_needs_upgrade.html"/>
-          <meta-include src="webapp/html/dialog_client_pin_prompt.html"/>
-          <meta-include src="webapp/html/dialog_client_third_party_auth.html"/>
-          <meta-include src="webapp/html/dialog_client_connect_failed.html"/>
-          <meta-include src="webapp/html/dialog_client_session_finished.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_unconnected.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_connecting.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_host_needs_upgrade.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_pin_prompt.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_third_party_auth.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_connect_failed.html"/>
+          <meta-include src="webapp/crd/html/dialog_client_session_finished.html"/>
         </div>
 
-        <meta-include src="webapp/html/dialog_connection_history.html"/>
-        <meta-include src="webapp/html/dialog_confirm_host_delete.html"/>
-        <meta-include src="webapp/html/dialog_manage_pairings.html"/>
+        <meta-include src="webapp/crd/html/dialog_connection_history.html"/>
+        <meta-include src="webapp/crd/html/dialog_confirm_host_delete.html"/>
+        <meta-include src="webapp/crd/html/dialog_manage_pairings.html"/>
 
       </div>  <!-- dialog-container -->
 
diff --git a/remoting/webapp/html/template_unittest.html b/remoting/webapp/crd/html/template_unittest.html
index eb99c5c..eb99c5c 100644
--- a/remoting/webapp/html/template_unittest.html
+++ b/remoting/webapp/crd/html/template_unittest.html
diff --git a/remoting/webapp/toolbar.css b/remoting/webapp/crd/html/toolbar.css
index 3726a29..3726a29 100644
--- a/remoting/webapp/toolbar.css
+++ b/remoting/webapp/crd/html/toolbar.css
diff --git a/remoting/webapp/html/toolbar.html b/remoting/webapp/crd/html/toolbar.html
index 04b9cfe..04b9cfe 100644
--- a/remoting/webapp/html/toolbar.html
+++ b/remoting/webapp/crd/html/toolbar.html
diff --git a/remoting/webapp/html/ui_header.html b/remoting/webapp/crd/html/ui_header.html
index 86eb68f..86eb68f 100644
--- a/remoting/webapp/html/ui_header.html
+++ b/remoting/webapp/crd/html/ui_header.html
diff --git a/remoting/webapp/html/ui_it2me.html b/remoting/webapp/crd/html/ui_it2me.html
index 15a3b10..15a3b10 100644
--- a/remoting/webapp/html/ui_it2me.html
+++ b/remoting/webapp/crd/html/ui_it2me.html
diff --git a/remoting/webapp/html/ui_me2me.html b/remoting/webapp/crd/html/ui_me2me.html
index ca2cc46b..ca2cc46b 100644
--- a/remoting/webapp/html/ui_me2me.html
+++ b/remoting/webapp/crd/html/ui_me2me.html
diff --git a/remoting/webapp/window_frame.css b/remoting/webapp/crd/html/window_frame.css
index 8284921..8284921 100644
--- a/remoting/webapp/window_frame.css
+++ b/remoting/webapp/crd/html/window_frame.css
diff --git a/remoting/webapp/html/window_frame.html b/remoting/webapp/crd/html/window_frame.html
index dbd1178..dbd1178 100644
--- a/remoting/webapp/html/window_frame.html
+++ b/remoting/webapp/crd/html/window_frame.html
diff --git a/remoting/webapp/background/app_launcher.js b/remoting/webapp/crd/js/app_launcher.js
index b506a6c..b506a6c 100644
--- a/remoting/webapp/background/app_launcher.js
+++ b/remoting/webapp/crd/js/app_launcher.js
diff --git a/remoting/webapp/background/background.js b/remoting/webapp/crd/js/background.js
index 03ec6ef..03ec6ef 100644
--- a/remoting/webapp/background/background.js
+++ b/remoting/webapp/crd/js/background.js
diff --git a/remoting/webapp/butter_bar.js b/remoting/webapp/crd/js/butter_bar.js
index a999b94..a999b94 100644
--- a/remoting/webapp/butter_bar.js
+++ b/remoting/webapp/crd/js/butter_bar.js
diff --git a/remoting/webapp/cast_extension_handler.js b/remoting/webapp/crd/js/cast_extension_handler.js
index d3a0924..d3a0924 100644
--- a/remoting/webapp/cast_extension_handler.js
+++ b/remoting/webapp/crd/js/cast_extension_handler.js
diff --git a/remoting/webapp/client_plugin.js b/remoting/webapp/crd/js/client_plugin.js
index 106fc78..106fc78 100644
--- a/remoting/webapp/client_plugin.js
+++ b/remoting/webapp/crd/js/client_plugin.js
diff --git a/remoting/webapp/client_plugin_impl.js b/remoting/webapp/crd/js/client_plugin_impl.js
index 28a973d..28a973d 100644
--- a/remoting/webapp/client_plugin_impl.js
+++ b/remoting/webapp/crd/js/client_plugin_impl.js
diff --git a/remoting/webapp/client_screen.js b/remoting/webapp/crd/js/client_screen.js
index 3b06083..3b06083 100644
--- a/remoting/webapp/client_screen.js
+++ b/remoting/webapp/crd/js/client_screen.js
diff --git a/remoting/webapp/client_session.js b/remoting/webapp/crd/js/client_session.js
index 16eaf18..16eaf18 100644
--- a/remoting/webapp/client_session.js
+++ b/remoting/webapp/crd/js/client_session.js
diff --git a/remoting/webapp/clipboard.js b/remoting/webapp/crd/js/clipboard.js
index b917929..b917929 100644
--- a/remoting/webapp/clipboard.js
+++ b/remoting/webapp/crd/js/clipboard.js
diff --git a/remoting/webapp/connection_stats.js b/remoting/webapp/crd/js/connection_stats.js
index 3f7404e..3f7404e 100644
--- a/remoting/webapp/connection_stats.js
+++ b/remoting/webapp/crd/js/connection_stats.js
diff --git a/remoting/webapp/cs_oauth2_trampoline.js b/remoting/webapp/crd/js/cs_oauth2_trampoline.js
index 0cf2327..0cf2327 100644
--- a/remoting/webapp/cs_oauth2_trampoline.js
+++ b/remoting/webapp/crd/js/cs_oauth2_trampoline.js
diff --git a/remoting/webapp/cs_third_party_auth_trampoline.js b/remoting/webapp/crd/js/cs_third_party_auth_trampoline.js
index f3c65c2..f3c65c2 100644
--- a/remoting/webapp/cs_third_party_auth_trampoline.js
+++ b/remoting/webapp/crd/js/cs_third_party_auth_trampoline.js
diff --git a/remoting/webapp/error.js b/remoting/webapp/crd/js/error.js
index 1b81a33..1b81a33 100644
--- a/remoting/webapp/error.js
+++ b/remoting/webapp/crd/js/error.js
diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/crd/js/event_handlers.js
index 480dffd..480dffd 100644
--- a/remoting/webapp/event_handlers.js
+++ b/remoting/webapp/crd/js/event_handlers.js
diff --git a/remoting/webapp/feedback.js b/remoting/webapp/crd/js/feedback.js
index 75b32be..75b32be 100644
--- a/remoting/webapp/feedback.js
+++ b/remoting/webapp/crd/js/feedback.js
diff --git a/remoting/webapp/format_iq.js b/remoting/webapp/crd/js/format_iq.js
index 6fb8e55..6fb8e55 100644
--- a/remoting/webapp/format_iq.js
+++ b/remoting/webapp/crd/js/format_iq.js
diff --git a/remoting/webapp/fullscreen.js b/remoting/webapp/crd/js/fullscreen.js
index 0107a6b..0107a6b 100644
--- a/remoting/webapp/fullscreen.js
+++ b/remoting/webapp/crd/js/fullscreen.js
diff --git a/remoting/webapp/fullscreen_v1.js b/remoting/webapp/crd/js/fullscreen_v1.js
index 5935e35..5935e35 100644
--- a/remoting/webapp/fullscreen_v1.js
+++ b/remoting/webapp/crd/js/fullscreen_v1.js
diff --git a/remoting/webapp/fullscreen_v2.js b/remoting/webapp/crd/js/fullscreen_v2.js
index afe2b4f..afe2b4f 100644
--- a/remoting/webapp/fullscreen_v2.js
+++ b/remoting/webapp/crd/js/fullscreen_v2.js
diff --git a/remoting/webapp/gnubby_auth_handler.js b/remoting/webapp/crd/js/gnubby_auth_handler.js
index 52fd495..52fd495 100644
--- a/remoting/webapp/gnubby_auth_handler.js
+++ b/remoting/webapp/crd/js/gnubby_auth_handler.js
diff --git a/remoting/webapp/hangout_session.js b/remoting/webapp/crd/js/hangout_session.js
index 7776f15..7776f15 100644
--- a/remoting/webapp/hangout_session.js
+++ b/remoting/webapp/crd/js/hangout_session.js
diff --git a/remoting/webapp/host.js b/remoting/webapp/crd/js/host.js
index 5d24b7f..5d24b7f 100644
--- a/remoting/webapp/host.js
+++ b/remoting/webapp/crd/js/host.js
diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/crd/js/host_controller.js
index 15035ea..15035ea 100644
--- a/remoting/webapp/host_controller.js
+++ b/remoting/webapp/crd/js/host_controller.js
diff --git a/remoting/webapp/host_daemon_facade.js b/remoting/webapp/crd/js/host_daemon_facade.js
index abd9719..abd9719 100644
--- a/remoting/webapp/host_daemon_facade.js
+++ b/remoting/webapp/crd/js/host_daemon_facade.js
diff --git a/remoting/webapp/host_install_dialog.js b/remoting/webapp/crd/js/host_install_dialog.js
index ab072e8..ab072e8 100644
--- a/remoting/webapp/host_install_dialog.js
+++ b/remoting/webapp/crd/js/host_install_dialog.js
diff --git a/remoting/webapp/host_installer.js b/remoting/webapp/crd/js/host_installer.js
index 48e62a2..48e62a2 100644
--- a/remoting/webapp/host_installer.js
+++ b/remoting/webapp/crd/js/host_installer.js
diff --git a/remoting/webapp/host_list.js b/remoting/webapp/crd/js/host_list.js
index ce7c18e..ce7c18e 100644
--- a/remoting/webapp/host_list.js
+++ b/remoting/webapp/crd/js/host_list.js
diff --git a/remoting/webapp/host_screen.js b/remoting/webapp/crd/js/host_screen.js
index 7aa917f..7aa917f 100644
--- a/remoting/webapp/host_screen.js
+++ b/remoting/webapp/crd/js/host_screen.js
diff --git a/remoting/webapp/host_session.js b/remoting/webapp/crd/js/host_session.js
index 93722be..93722be 100644
--- a/remoting/webapp/host_session.js
+++ b/remoting/webapp/crd/js/host_session.js
diff --git a/remoting/webapp/host_settings.js b/remoting/webapp/crd/js/host_settings.js
index c2dee62..c2dee62 100644
--- a/remoting/webapp/host_settings.js
+++ b/remoting/webapp/crd/js/host_settings.js
diff --git a/remoting/webapp/host_setup_dialog.js b/remoting/webapp/crd/js/host_setup_dialog.js
index 4697c900..4697c900 100644
--- a/remoting/webapp/host_setup_dialog.js
+++ b/remoting/webapp/crd/js/host_setup_dialog.js
diff --git a/remoting/webapp/host_table_entry.js b/remoting/webapp/crd/js/host_table_entry.js
index 27e44ac7..27e44ac7 100644
--- a/remoting/webapp/host_table_entry.js
+++ b/remoting/webapp/crd/js/host_table_entry.js
diff --git a/remoting/webapp/identity.js b/remoting/webapp/crd/js/identity.js
index aae7b39..aae7b39 100644
--- a/remoting/webapp/identity.js
+++ b/remoting/webapp/crd/js/identity.js
diff --git a/remoting/webapp/background/it2me_helpee_channel.js b/remoting/webapp/crd/js/it2me_helpee_channel.js
index b53f798..b53f798 100644
--- a/remoting/webapp/background/it2me_helpee_channel.js
+++ b/remoting/webapp/crd/js/it2me_helpee_channel.js
diff --git a/remoting/webapp/background/it2me_helper_channel.js b/remoting/webapp/crd/js/it2me_helper_channel.js
index 84608be..84608be 100644
--- a/remoting/webapp/background/it2me_helper_channel.js
+++ b/remoting/webapp/crd/js/it2me_helper_channel.js
diff --git a/remoting/webapp/it2me_host_facade.js b/remoting/webapp/crd/js/it2me_host_facade.js
index eab5ee1..eab5ee1 100644
--- a/remoting/webapp/it2me_host_facade.js
+++ b/remoting/webapp/crd/js/it2me_host_facade.js
diff --git a/remoting/webapp/background/it2me_service.js b/remoting/webapp/crd/js/it2me_service.js
index 9e881b8..9e881b8 100644
--- a/remoting/webapp/background/it2me_service.js
+++ b/remoting/webapp/crd/js/it2me_service.js
diff --git a/remoting/webapp/l10n.js b/remoting/webapp/crd/js/l10n.js
index 1774fb9..1774fb9 100644
--- a/remoting/webapp/l10n.js
+++ b/remoting/webapp/crd/js/l10n.js
diff --git a/remoting/webapp/log_to_server.js b/remoting/webapp/crd/js/log_to_server.js
index 53cf161..53cf161 100644
--- a/remoting/webapp/log_to_server.js
+++ b/remoting/webapp/crd/js/log_to_server.js
diff --git a/remoting/webapp/media_source_renderer.js b/remoting/webapp/crd/js/media_source_renderer.js
index b9cc24c..b9cc24c 100644
--- a/remoting/webapp/media_source_renderer.js
+++ b/remoting/webapp/crd/js/media_source_renderer.js
diff --git a/remoting/webapp/menu_button.js b/remoting/webapp/crd/js/menu_button.js
index ce09776..ce09776 100644
--- a/remoting/webapp/menu_button.js
+++ b/remoting/webapp/crd/js/menu_button.js
diff --git a/remoting/webapp/oauth2.js b/remoting/webapp/crd/js/oauth2.js
index c504a64..c504a64 100644
--- a/remoting/webapp/oauth2.js
+++ b/remoting/webapp/crd/js/oauth2.js
diff --git a/remoting/webapp/oauth2_api.js b/remoting/webapp/crd/js/oauth2_api.js
index 8c49efe..8c49efe 100644
--- a/remoting/webapp/oauth2_api.js
+++ b/remoting/webapp/crd/js/oauth2_api.js
diff --git a/remoting/webapp/options_menu.js b/remoting/webapp/crd/js/options_menu.js
index bddfb89..bddfb89 100644
--- a/remoting/webapp/options_menu.js
+++ b/remoting/webapp/crd/js/options_menu.js
diff --git a/remoting/webapp/paired_client_manager.js b/remoting/webapp/crd/js/paired_client_manager.js
index d001cf3..d001cf3 100644
--- a/remoting/webapp/paired_client_manager.js
+++ b/remoting/webapp/crd/js/paired_client_manager.js
diff --git a/remoting/webapp/plugin_settings.js b/remoting/webapp/crd/js/plugin_settings.js
index 44294d2..44294d2 100644
--- a/remoting/webapp/plugin_settings.js
+++ b/remoting/webapp/crd/js/plugin_settings.js
diff --git a/remoting/webapp/remoting.js b/remoting/webapp/crd/js/remoting.js
index 037921c..037921c 100644
--- a/remoting/webapp/remoting.js
+++ b/remoting/webapp/crd/js/remoting.js
diff --git a/remoting/webapp/server_log_entry.js b/remoting/webapp/crd/js/server_log_entry.js
index 557f014..557f014 100644
--- a/remoting/webapp/server_log_entry.js
+++ b/remoting/webapp/crd/js/server_log_entry.js
diff --git a/remoting/webapp/session_connector.js b/remoting/webapp/crd/js/session_connector.js
index dfdcda6..dfdcda6 100644
--- a/remoting/webapp/session_connector.js
+++ b/remoting/webapp/crd/js/session_connector.js
diff --git a/remoting/webapp/session_connector_impl.js b/remoting/webapp/crd/js/session_connector_impl.js
index c9ce6fd..c9ce6fd 100644
--- a/remoting/webapp/session_connector_impl.js
+++ b/remoting/webapp/crd/js/session_connector_impl.js
diff --git a/remoting/webapp/signal_strategy.js b/remoting/webapp/crd/js/signal_strategy.js
index 02c8acb..02c8acb 100644
--- a/remoting/webapp/signal_strategy.js
+++ b/remoting/webapp/crd/js/signal_strategy.js
diff --git a/remoting/webapp/smart_reconnector.js b/remoting/webapp/crd/js/smart_reconnector.js
index 7cc50bf..7cc50bf 100644
--- a/remoting/webapp/smart_reconnector.js
+++ b/remoting/webapp/crd/js/smart_reconnector.js
diff --git a/remoting/webapp/stats_accumulator.js b/remoting/webapp/crd/js/stats_accumulator.js
index adf89c5..adf89c5 100644
--- a/remoting/webapp/stats_accumulator.js
+++ b/remoting/webapp/crd/js/stats_accumulator.js
diff --git a/remoting/webapp/third_party_host_permissions.js b/remoting/webapp/crd/js/third_party_host_permissions.js
index 1fd3edf..1fd3edf 100644
--- a/remoting/webapp/third_party_host_permissions.js
+++ b/remoting/webapp/crd/js/third_party_host_permissions.js
diff --git a/remoting/webapp/third_party_token_fetcher.js b/remoting/webapp/crd/js/third_party_token_fetcher.js
index 9c8cce1..9c8cce1 100644
--- a/remoting/webapp/third_party_token_fetcher.js
+++ b/remoting/webapp/crd/js/third_party_token_fetcher.js
diff --git a/remoting/webapp/toolbar.js b/remoting/webapp/crd/js/toolbar.js
index d6a6942..d6a6942 100644
--- a/remoting/webapp/toolbar.js
+++ b/remoting/webapp/crd/js/toolbar.js
diff --git a/remoting/webapp/typecheck.js b/remoting/webapp/crd/js/typecheck.js
index 5b5f865..5b5f865 100644
--- a/remoting/webapp/typecheck.js
+++ b/remoting/webapp/crd/js/typecheck.js
diff --git a/remoting/webapp/ui_mode.js b/remoting/webapp/crd/js/ui_mode.js
index b69b8a3..b69b8a3 100644
--- a/remoting/webapp/ui_mode.js
+++ b/remoting/webapp/crd/js/ui_mode.js
diff --git a/remoting/webapp/video_frame_recorder.js b/remoting/webapp/crd/js/video_frame_recorder.js
index 6730162..6730162 100644
--- a/remoting/webapp/video_frame_recorder.js
+++ b/remoting/webapp/crd/js/video_frame_recorder.js
diff --git a/remoting/webapp/wcs.js b/remoting/webapp/crd/js/wcs.js
index 3a6d1e3..3a6d1e3 100644
--- a/remoting/webapp/wcs.js
+++ b/remoting/webapp/crd/js/wcs.js
diff --git a/remoting/webapp/wcs_adapter.js b/remoting/webapp/crd/js/wcs_adapter.js
index 9ac7cc48..9ac7cc48 100644
--- a/remoting/webapp/wcs_adapter.js
+++ b/remoting/webapp/crd/js/wcs_adapter.js
diff --git a/remoting/webapp/wcs_loader.js b/remoting/webapp/crd/js/wcs_loader.js
index 3ab10bf..3ab10bf 100644
--- a/remoting/webapp/wcs_loader.js
+++ b/remoting/webapp/crd/js/wcs_loader.js
diff --git a/remoting/webapp/wcs_sandbox_container.js b/remoting/webapp/crd/js/wcs_sandbox_container.js
index 4104c36..4104c36 100644
--- a/remoting/webapp/wcs_sandbox_container.js
+++ b/remoting/webapp/crd/js/wcs_sandbox_container.js
diff --git a/remoting/webapp/wcs_sandbox_content.js b/remoting/webapp/crd/js/wcs_sandbox_content.js
index 213d87a..213d87a 100644
--- a/remoting/webapp/wcs_sandbox_content.js
+++ b/remoting/webapp/crd/js/wcs_sandbox_content.js
diff --git a/remoting/webapp/window_frame.js b/remoting/webapp/crd/js/window_frame.js
index 75ecf49..75ecf49 100644
--- a/remoting/webapp/window_frame.js
+++ b/remoting/webapp/crd/js/window_frame.js
diff --git a/remoting/webapp/xhr.js b/remoting/webapp/crd/js/xhr.js
index b0c2056..b0c2056 100644
--- a/remoting/webapp/xhr.js
+++ b/remoting/webapp/crd/js/xhr.js
diff --git a/remoting/webapp/xhr_proxy.js b/remoting/webapp/crd/js/xhr_proxy.js
index c2cadb5..c2cadb5 100644
--- a/remoting/webapp/xhr_proxy.js
+++ b/remoting/webapp/crd/js/xhr_proxy.js
diff --git a/remoting/webapp/xmpp_connection.js b/remoting/webapp/crd/js/xmpp_connection.js
index adf911a..adf911a 100644
--- a/remoting/webapp/xmpp_connection.js
+++ b/remoting/webapp/crd/js/xmpp_connection.js
diff --git a/remoting/webapp/xmpp_login_handler.js b/remoting/webapp/crd/js/xmpp_login_handler.js
index f2034f4..f2034f4 100644
--- a/remoting/webapp/xmpp_login_handler.js
+++ b/remoting/webapp/crd/js/xmpp_login_handler.js
diff --git a/remoting/webapp/xmpp_stream_parser.js b/remoting/webapp/crd/js/xmpp_stream_parser.js
index 918caf0..918caf0 100644
--- a/remoting/webapp/xmpp_stream_parser.js
+++ b/remoting/webapp/crd/js/xmpp_stream_parser.js
diff --git a/remoting/webapp/manifest.json.jinja2 b/remoting/webapp/crd/manifest.json.jinja2
index 03e3a1f..03e3a1f 100644
--- a/remoting/webapp/manifest.json.jinja2
+++ b/remoting/webapp/crd/manifest.json.jinja2
diff --git a/remoting/webapp/remoting_client_pnacl.nmf b/remoting/webapp/crd/remoting_client_pnacl.nmf
index 8181c0a..8181c0a 100644
--- a/remoting/webapp/remoting_client_pnacl.nmf
+++ b/remoting/webapp/crd/remoting_client_pnacl.nmf
diff --git a/remoting/webapp/dividerbottom.webp b/remoting/webapp/crd/resources/dividerbottom.webp
index dd6c37f..dd6c37f 100644
--- a/remoting/webapp/dividerbottom.webp
+++ b/remoting/webapp/crd/resources/dividerbottom.webp
diff --git a/remoting/webapp/dividertop.webp b/remoting/webapp/crd/resources/dividertop.webp
index 3bf7535..3bf7535 100644
--- a/remoting/webapp/dividertop.webp
+++ b/remoting/webapp/crd/resources/dividertop.webp
diff --git a/remoting/webapp/scale-to-fit.webp b/remoting/webapp/crd/resources/scale-to-fit.webp
index 41ff90e..41ff90e 100644
--- a/remoting/webapp/scale-to-fit.webp
+++ b/remoting/webapp/crd/resources/scale-to-fit.webp