81 files changed, 148 insertions, 102 deletions

diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 56ce7b4..7b84fd6 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -49,96 +49,96 @@
       ['branding=="Chrome"', {
         # Must match host/plugin/constants.h
         'host_plugin_name': 'Chrome Remote Desktop Host',
-        'remoting_it2me_locale_files': [
-          'webapp/me2mom/_locales.official/ar/messages.json',
-          'webapp/me2mom/_locales.official/bg/messages.json',
-          'webapp/me2mom/_locales.official/ca/messages.json',
-          'webapp/me2mom/_locales.official/cs/messages.json',
-          'webapp/me2mom/_locales.official/da/messages.json',
-          'webapp/me2mom/_locales.official/de/messages.json',
-          'webapp/me2mom/_locales.official/el/messages.json',
-          'webapp/me2mom/_locales.official/en/messages.json',
-          'webapp/me2mom/_locales.official/en_GB/messages.json',
-          'webapp/me2mom/_locales.official/es/messages.json',
-          'webapp/me2mom/_locales.official/es_419/messages.json',
-          'webapp/me2mom/_locales.official/et/messages.json',
-          'webapp/me2mom/_locales.official/fi/messages.json',
-          'webapp/me2mom/_locales.official/fil/messages.json',
-          'webapp/me2mom/_locales.official/fr/messages.json',
-          'webapp/me2mom/_locales.official/he/messages.json',
-          'webapp/me2mom/_locales.official/hi/messages.json',
-          'webapp/me2mom/_locales.official/hr/messages.json',
-          'webapp/me2mom/_locales.official/hu/messages.json',
-          'webapp/me2mom/_locales.official/id/messages.json',
-          'webapp/me2mom/_locales.official/it/messages.json',
-          'webapp/me2mom/_locales.official/ja/messages.json',
-          'webapp/me2mom/_locales.official/ko/messages.json',
-          'webapp/me2mom/_locales.official/lt/messages.json',
-          'webapp/me2mom/_locales.official/lv/messages.json',
-          'webapp/me2mom/_locales.official/nb/messages.json',
-          'webapp/me2mom/_locales.official/nl/messages.json',
-          'webapp/me2mom/_locales.official/pl/messages.json',
-          'webapp/me2mom/_locales.official/pt_BR/messages.json',
-          'webapp/me2mom/_locales.official/pt_PT/messages.json',
-          'webapp/me2mom/_locales.official/ro/messages.json',
-          'webapp/me2mom/_locales.official/ru/messages.json',
-          'webapp/me2mom/_locales.official/sk/messages.json',
-          'webapp/me2mom/_locales.official/sl/messages.json',
-          'webapp/me2mom/_locales.official/sr/messages.json',
-          'webapp/me2mom/_locales.official/sv/messages.json',
-          'webapp/me2mom/_locales.official/th/messages.json',
-          'webapp/me2mom/_locales.official/tr/messages.json',
-          'webapp/me2mom/_locales.official/uk/messages.json',
-          'webapp/me2mom/_locales.official/vi/messages.json',
-          'webapp/me2mom/_locales.official/zh_CN/messages.json',
-          'webapp/me2mom/_locales.official/zh_TW/messages.json',
+        'remoting_webapp_locale_files': [
+          'webapp/_locales.official/ar/messages.json',
+          'webapp/_locales.official/bg/messages.json',
+          'webapp/_locales.official/ca/messages.json',
+          'webapp/_locales.official/cs/messages.json',
+          'webapp/_locales.official/da/messages.json',
+          'webapp/_locales.official/de/messages.json',
+          'webapp/_locales.official/el/messages.json',
+          'webapp/_locales.official/en/messages.json',
+          'webapp/_locales.official/en_GB/messages.json',
+          'webapp/_locales.official/es/messages.json',
+          'webapp/_locales.official/es_419/messages.json',
+          'webapp/_locales.official/et/messages.json',
+          'webapp/_locales.official/fi/messages.json',
+          'webapp/_locales.official/fil/messages.json',
+          'webapp/_locales.official/fr/messages.json',
+          'webapp/_locales.official/he/messages.json',
+          'webapp/_locales.official/hi/messages.json',
+          'webapp/_locales.official/hr/messages.json',
+          'webapp/_locales.official/hu/messages.json',
+          'webapp/_locales.official/id/messages.json',
+          'webapp/_locales.official/it/messages.json',
+          'webapp/_locales.official/ja/messages.json',
+          'webapp/_locales.official/ko/messages.json',
+          'webapp/_locales.official/lt/messages.json',
+          'webapp/_locales.official/lv/messages.json',
+          'webapp/_locales.official/nb/messages.json',
+          'webapp/_locales.official/nl/messages.json',
+          'webapp/_locales.official/pl/messages.json',
+          'webapp/_locales.official/pt_BR/messages.json',
+          'webapp/_locales.official/pt_PT/messages.json',
+          'webapp/_locales.official/ro/messages.json',
+          'webapp/_locales.official/ru/messages.json',
+          'webapp/_locales.official/sk/messages.json',
+          'webapp/_locales.official/sl/messages.json',
+          'webapp/_locales.official/sr/messages.json',
+          'webapp/_locales.official/sv/messages.json',
+          'webapp/_locales.official/th/messages.json',
+          'webapp/_locales.official/tr/messages.json',
+          'webapp/_locales.official/uk/messages.json',
+          'webapp/_locales.official/vi/messages.json',
+          'webapp/_locales.official/zh_CN/messages.json',
+          'webapp/_locales.official/zh_TW/messages.json',
         ],
       }, {  # else: branding!="Chrome"
         # Must match host/plugin/constants.h
         'host_plugin_name': 'Chromoting Host',
-        'remoting_it2me_locale_files': [
-          'webapp/me2mom/_locales/en/messages.json',
+        'remoting_webapp_locale_files': [
+          'webapp/_locales/en/messages.json',
         ],
       }],
     ],
-    'remoting_it2me_files': [
+    'remoting_webapp_files': [
       'resources/icon_cross.png',
       'resources/icon_host.png',
       'resources/icon_pencil.png',
       'resources/icon_warning.png',
-      'webapp/me2mom/choice.css',
-      'webapp/me2mom/choice.html',
-      'webapp/me2mom/client_screen.js',
-      'webapp/me2mom/client_session.js',
-      'webapp/me2mom/cs_oauth2_trampoline.js',
-      'webapp/me2mom/debug_log.css',
-      'webapp/me2mom/debug_log.js',
-      'webapp/me2mom/dividerbottom.png',
-      'webapp/me2mom/dividertop.png',
-      'webapp/me2mom/event_handlers.js',
-      'webapp/me2mom/host_list.js',
-      'webapp/me2mom/host_screen.js',
-      'webapp/me2mom/host_session.js',
-      'webapp/me2mom/host_table_entry.js',
-      'webapp/me2mom/l10n.js',
-      'webapp/me2mom/log_to_server.js',
-      'webapp/me2mom/main.css',
-      'webapp/me2mom/manifest.json',
-      'webapp/me2mom/oauth2.js',
-      'webapp/me2mom/oauth2_callback.html',
-      'webapp/me2mom/plugin_settings.js',
-      'webapp/me2mom/remoting.js',
-      'webapp/me2mom/scale-to-fit.png',
-      'webapp/me2mom/server_log_entry.js',
-      'webapp/me2mom/spinner.gif',
-      'webapp/me2mom/stats_accumulator.js',
-      'webapp/me2mom/toolbar.css',
-      'webapp/me2mom/toolbar.js',
-      'webapp/me2mom/ui_mode.js',
-      'webapp/me2mom/util.js',
-      'webapp/me2mom/wcs.js',
-      'webapp/me2mom/wcs_loader.js',
-      'webapp/me2mom/xhr.js',
+      'webapp/choice.css',
+      'webapp/choice.html',
+      'webapp/client_screen.js',
+      'webapp/client_session.js',
+      'webapp/cs_oauth2_trampoline.js',
+      'webapp/debug_log.css',
+      'webapp/debug_log.js',
+      'webapp/dividerbottom.png',
+      'webapp/dividertop.png',
+      'webapp/event_handlers.js',
+      'webapp/host_list.js',
+      'webapp/host_screen.js',
+      'webapp/host_session.js',
+      'webapp/host_table_entry.js',
+      'webapp/l10n.js',
+      'webapp/log_to_server.js',
+      'webapp/main.css',
+      'webapp/manifest.json',
+      'webapp/oauth2.js',
+      'webapp/oauth2_callback.html',
+      'webapp/plugin_settings.js',
+      'webapp/remoting.js',
+      'webapp/scale-to-fit.png',
+      'webapp/server_log_entry.js',
+      'webapp/spinner.gif',
+      'webapp/stats_accumulator.js',
+      'webapp/toolbar.css',
+      'webapp/toolbar.js',
+      'webapp/ui_mode.js',
+      'webapp/util.js',
+      'webapp/wcs.js',
+      'webapp/wcs_loader.js',
+      'webapp/xhr.js',
       'resources/chromoting16.png',
       'resources/chromoting48.png',
       'resources/chromoting128.png',
@@ -344,7 +344,12 @@
         }],
       ],
     },  # end of target 'remoting_host_plugin'
+
     {
+      # This is a deprecated target that has been replaced with remoting_it2me.
+      # It is kept here because there are some pieces that still depend on
+      # this target.
+      # TODO(sergeyu): Remove this target.
       'target_name': 'webapp_it2me',
       'type': 'none',
       'dependencies': [
@@ -352,9 +357,50 @@
       ],
       'sources': [
         'webapp/build-webapp.py',
+        '<@(remoting_webapp_files)',
+        '<@(remoting_webapp_locale_files)',
+      ],
+      'actions': [
+        {
+          'action_name': 'Build Remoting WebApp',
+          'output_dir': '<(PRODUCT_DIR)/remoting/it2me.webapp',
+          'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
+          'zip_path': '<(PRODUCT_DIR)/remoting-it2me.zip',
+          'inputs': [
+            'webapp/build-webapp.py',
+            '<(_plugin_path)',
+            '<@(remoting_webapp_files)',
+            '<@(remoting_webapp_locale_files)',
+          ],
+          'outputs': [
+            '<(_output_dir)',
+            '<(_zip_path)',
+          ],
+          'action': [
+            'python', 'webapp/build-webapp.py',
+            '<(buildtype)',
+            '<(host_plugin_mime_type)',
+            '<(_output_dir)',
+            '<(_zip_path)',
+            '<(_plugin_path)',
+            '<@(remoting_webapp_files)',
+            '--locales',
+            '<@(remoting_webapp_locale_files)',
+          ],
+        },
+      ],
+    }, # end of target 'remoting_webapp'
+    {
+      'target_name': 'remoting_webapp',
+      'type': 'none',
+      'dependencies': [
+        'remoting_host_plugin',
+      ],
+      'sources': [
+        'webapp/build-webapp.py',
         'webapp/verify-webapp.py',
-        '<@(remoting_it2me_files)',
-        '<@(remoting_it2me_locale_files)',
+        '<@(remoting_webapp_files)',
+        '<@(remoting_webapp_locale_files)',
       ],
       # Can't use a 'copies' because we need to manipulate
       # the manifest file to get the right plugin name.
@@ -364,41 +410,41 @@
       # when the actual project is generated.
       'actions': [
         {
-          'action_name': 'Verify It2Me WebApp i18n',
+          'action_name': 'Verify Remoting WebApp i18n',
           'inputs': [
             'webapp/verify-webapp.py',
-            'webapp/me2mom/_locales/en/messages.json',
-            'webapp/me2mom/choice.html',
-            'webapp/me2mom/host_table_entry.js',
-            'webapp/me2mom/manifest.json',
-            'webapp/me2mom/remoting.js',
+            'webapp/_locales/en/messages.json',
+            'webapp/choice.html',
+            'webapp/host_table_entry.js',
+            'webapp/manifest.json',
+            'webapp/remoting.js',
             'host/plugin/host_script_object.cc',
           ],
           'outputs': [
-            '<(PRODUCT_DIR)/remoting/it2me_verified.stamp',
+            '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
           ],
           'action': [
             'python',
             'webapp/verify-webapp.py',
-            '<(PRODUCT_DIR)/remoting/it2me_verified.stamp',
-            'webapp/me2mom/_locales/en/messages.json',
-            'webapp/me2mom/choice.html',
-            'webapp/me2mom/host_table_entry.js',
-            'webapp/me2mom/manifest.json',
-            'webapp/me2mom/remoting.js',
+            '<(PRODUCT_DIR)/remoting/webapp_verified.stamp',
+            'webapp/_locales/en/messages.json',
+            'webapp/choice.html',
+            'webapp/host_table_entry.js',
+            'webapp/manifest.json',
+            'webapp/remoting.js',
             'host/plugin/host_script_object.cc',
          ],
         },
         {
-          'action_name': 'Build It2Me WebApp',
-          'output_dir': '<(PRODUCT_DIR)/remoting/it2me.webapp',
+          'action_name': 'Build Remoting WebApp',
+          'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
           'plugin_path': '<(PRODUCT_DIR)/<(host_plugin_prefix)remoting_host_plugin.<(host_plugin_extension)',
-          'zip_path': '<(PRODUCT_DIR)/remoting-it2me.zip',
+          'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
           'inputs': [
             'webapp/build-webapp.py',
             '<(_plugin_path)',
-            '<@(remoting_it2me_files)',
-            '<@(remoting_it2me_locale_files)',
+            '<@(remoting_webapp_files)',
+            '<@(remoting_webapp_locale_files)',
           ],
           'outputs': [
             '<(_output_dir)',
@@ -411,13 +457,13 @@
             '<(_output_dir)',
             '<(_zip_path)',
             '<(_plugin_path)',
-            '<@(remoting_it2me_files)',
+            '<@(remoting_webapp_files)',
             '--locales',
-            '<@(remoting_it2me_locale_files)',
+            '<@(remoting_webapp_locale_files)',
           ],
         },
       ],
-    }, # end of target 'webapp_it2me'
+    }, # end of target 'remoting_webapp'
     {
       'target_name': 'remoting_base',
       'type': 'static_library',
diff --git a/remoting/webapp/me2mom/_locales.official/ar/messages.json b/remoting/webapp/_locales.official/ar/messages.json
index 0465096..0465096 100644
--- a/remoting/webapp/me2mom/_locales.official/ar/messages.json
+++ b/remoting/webapp/_locales.official/ar/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/bg/messages.json b/remoting/webapp/_locales.official/bg/messages.json
index be5e085e..be5e085e 100644
--- a/remoting/webapp/me2mom/_locales.official/bg/messages.json
+++ b/remoting/webapp/_locales.official/bg/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/ca/messages.json b/remoting/webapp/_locales.official/ca/messages.json
index a8e2e00..a8e2e00 100644
--- a/remoting/webapp/me2mom/_locales.official/ca/messages.json
+++ b/remoting/webapp/_locales.official/ca/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/cs/messages.json b/remoting/webapp/_locales.official/cs/messages.json
index ae76202..ae76202 100644
--- a/remoting/webapp/me2mom/_locales.official/cs/messages.json
+++ b/remoting/webapp/_locales.official/cs/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/da/messages.json b/remoting/webapp/_locales.official/da/messages.json
index 5ecbb9c..5ecbb9c 100644
--- a/remoting/webapp/me2mom/_locales.official/da/messages.json
+++ b/remoting/webapp/_locales.official/da/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/de/messages.json b/remoting/webapp/_locales.official/de/messages.json
index c288950..c288950 100644
--- a/remoting/webapp/me2mom/_locales.official/de/messages.json
+++ b/remoting/webapp/_locales.official/de/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/el/messages.json b/remoting/webapp/_locales.official/el/messages.json
index 151c59c..151c59c 100644
--- a/remoting/webapp/me2mom/_locales.official/el/messages.json
+++ b/remoting/webapp/_locales.official/el/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/en/messages.json b/remoting/webapp/_locales.official/en/messages.json
index daf776e..daf776e 100644
--- a/remoting/webapp/me2mom/_locales.official/en/messages.json
+++ b/remoting/webapp/_locales.official/en/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/en_GB/messages.json b/remoting/webapp/_locales.official/en_GB/messages.json
index 706d45d..706d45d 100644
--- a/remoting/webapp/me2mom/_locales.official/en_GB/messages.json
+++ b/remoting/webapp/_locales.official/en_GB/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/es/messages.json b/remoting/webapp/_locales.official/es/messages.json
index be8bc65..be8bc65 100644
--- a/remoting/webapp/me2mom/_locales.official/es/messages.json
+++ b/remoting/webapp/_locales.official/es/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/es_419/messages.json b/remoting/webapp/_locales.official/es_419/messages.json
index 335e866..335e866 100644
--- a/remoting/webapp/me2mom/_locales.official/es_419/messages.json
+++ b/remoting/webapp/_locales.official/es_419/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/et/messages.json b/remoting/webapp/_locales.official/et/messages.json
index 3082f7b..3082f7b 100644
--- a/remoting/webapp/me2mom/_locales.official/et/messages.json
+++ b/remoting/webapp/_locales.official/et/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/fi/messages.json b/remoting/webapp/_locales.official/fi/messages.json
index 529fb29..529fb29 100644
--- a/remoting/webapp/me2mom/_locales.official/fi/messages.json
+++ b/remoting/webapp/_locales.official/fi/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/fil/messages.json b/remoting/webapp/_locales.official/fil/messages.json
index 9722973..9722973 100644
--- a/remoting/webapp/me2mom/_locales.official/fil/messages.json
+++ b/remoting/webapp/_locales.official/fil/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/fr/messages.json b/remoting/webapp/_locales.official/fr/messages.json
index 976df3e..976df3e 100644
--- a/remoting/webapp/me2mom/_locales.official/fr/messages.json
+++ b/remoting/webapp/_locales.official/fr/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/he/messages.json b/remoting/webapp/_locales.official/he/messages.json
index 54d91dd..54d91dd 100644
--- a/remoting/webapp/me2mom/_locales.official/he/messages.json
+++ b/remoting/webapp/_locales.official/he/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/hi/messages.json b/remoting/webapp/_locales.official/hi/messages.json
index c26df7b..c26df7b 100644
--- a/remoting/webapp/me2mom/_locales.official/hi/messages.json
+++ b/remoting/webapp/_locales.official/hi/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/hr/messages.json b/remoting/webapp/_locales.official/hr/messages.json
index 234d5f6..234d5f6 100644
--- a/remoting/webapp/me2mom/_locales.official/hr/messages.json
+++ b/remoting/webapp/_locales.official/hr/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/hu/messages.json b/remoting/webapp/_locales.official/hu/messages.json
index 02b6b57..02b6b57 100644
--- a/remoting/webapp/me2mom/_locales.official/hu/messages.json
+++ b/remoting/webapp/_locales.official/hu/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/id/messages.json b/remoting/webapp/_locales.official/id/messages.json
index 6666200..6666200 100644
--- a/remoting/webapp/me2mom/_locales.official/id/messages.json
+++ b/remoting/webapp/_locales.official/id/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/it/messages.json b/remoting/webapp/_locales.official/it/messages.json
index 282a78c..282a78c 100644
--- a/remoting/webapp/me2mom/_locales.official/it/messages.json
+++ b/remoting/webapp/_locales.official/it/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/ja/messages.json b/remoting/webapp/_locales.official/ja/messages.json
index 61b044c..61b044c 100644
--- a/remoting/webapp/me2mom/_locales.official/ja/messages.json
+++ b/remoting/webapp/_locales.official/ja/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/ko/messages.json b/remoting/webapp/_locales.official/ko/messages.json
index 3e6c4156..3e6c4156 100644
--- a/remoting/webapp/me2mom/_locales.official/ko/messages.json
+++ b/remoting/webapp/_locales.official/ko/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/lt/messages.json b/remoting/webapp/_locales.official/lt/messages.json
index 8ac5bbb..8ac5bbb 100644
--- a/remoting/webapp/me2mom/_locales.official/lt/messages.json
+++ b/remoting/webapp/_locales.official/lt/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/lv/messages.json b/remoting/webapp/_locales.official/lv/messages.json
index a6c8c5b..a6c8c5b 100644
--- a/remoting/webapp/me2mom/_locales.official/lv/messages.json
+++ b/remoting/webapp/_locales.official/lv/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/nb/messages.json b/remoting/webapp/_locales.official/nb/messages.json
index 0941d8c..0941d8c 100644
--- a/remoting/webapp/me2mom/_locales.official/nb/messages.json
+++ b/remoting/webapp/_locales.official/nb/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/nl/messages.json b/remoting/webapp/_locales.official/nl/messages.json
index 326a312..326a312 100644
--- a/remoting/webapp/me2mom/_locales.official/nl/messages.json
+++ b/remoting/webapp/_locales.official/nl/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/pl/messages.json b/remoting/webapp/_locales.official/pl/messages.json
index 58e1779..58e1779 100644
--- a/remoting/webapp/me2mom/_locales.official/pl/messages.json
+++ b/remoting/webapp/_locales.official/pl/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/pt_BR/messages.json b/remoting/webapp/_locales.official/pt_BR/messages.json
index 4f8f714..4f8f714 100644
--- a/remoting/webapp/me2mom/_locales.official/pt_BR/messages.json
+++ b/remoting/webapp/_locales.official/pt_BR/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/pt_PT/messages.json b/remoting/webapp/_locales.official/pt_PT/messages.json
index 508a28d..508a28d 100644
--- a/remoting/webapp/me2mom/_locales.official/pt_PT/messages.json
+++ b/remoting/webapp/_locales.official/pt_PT/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/ro/messages.json b/remoting/webapp/_locales.official/ro/messages.json
index dace99e..dace99e 100644
--- a/remoting/webapp/me2mom/_locales.official/ro/messages.json
+++ b/remoting/webapp/_locales.official/ro/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/ru/messages.json b/remoting/webapp/_locales.official/ru/messages.json
index fcc5c0c..fcc5c0c 100644
--- a/remoting/webapp/me2mom/_locales.official/ru/messages.json
+++ b/remoting/webapp/_locales.official/ru/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/sk/messages.json b/remoting/webapp/_locales.official/sk/messages.json
index a4b8caa..a4b8caa 100644
--- a/remoting/webapp/me2mom/_locales.official/sk/messages.json
+++ b/remoting/webapp/_locales.official/sk/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/sl/messages.json b/remoting/webapp/_locales.official/sl/messages.json
index 1d64a78..1d64a78 100644
--- a/remoting/webapp/me2mom/_locales.official/sl/messages.json
+++ b/remoting/webapp/_locales.official/sl/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/sr/messages.json b/remoting/webapp/_locales.official/sr/messages.json
index c6ce164..c6ce164 100644
--- a/remoting/webapp/me2mom/_locales.official/sr/messages.json
+++ b/remoting/webapp/_locales.official/sr/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/sv/messages.json b/remoting/webapp/_locales.official/sv/messages.json
index fdc4d77..fdc4d77 100644
--- a/remoting/webapp/me2mom/_locales.official/sv/messages.json
+++ b/remoting/webapp/_locales.official/sv/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/th/messages.json b/remoting/webapp/_locales.official/th/messages.json
index 5f26b03..5f26b03 100644
--- a/remoting/webapp/me2mom/_locales.official/th/messages.json
+++ b/remoting/webapp/_locales.official/th/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/tr/messages.json b/remoting/webapp/_locales.official/tr/messages.json
index a972025..a972025 100644
--- a/remoting/webapp/me2mom/_locales.official/tr/messages.json
+++ b/remoting/webapp/_locales.official/tr/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/uk/messages.json b/remoting/webapp/_locales.official/uk/messages.json
index 68663b4..68663b4 100644
--- a/remoting/webapp/me2mom/_locales.official/uk/messages.json
+++ b/remoting/webapp/_locales.official/uk/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/vi/messages.json b/remoting/webapp/_locales.official/vi/messages.json
index 9e249bc..9e249bc 100644
--- a/remoting/webapp/me2mom/_locales.official/vi/messages.json
+++ b/remoting/webapp/_locales.official/vi/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/zh_CN/messages.json b/remoting/webapp/_locales.official/zh_CN/messages.json
index b3fabd2..b3fabd2 100644
--- a/remoting/webapp/me2mom/_locales.official/zh_CN/messages.json
+++ b/remoting/webapp/_locales.official/zh_CN/messages.json
diff --git a/remoting/webapp/me2mom/_locales.official/zh_TW/messages.json b/remoting/webapp/_locales.official/zh_TW/messages.json
index 33d4129..33d4129 100644
--- a/remoting/webapp/me2mom/_locales.official/zh_TW/messages.json
+++ b/remoting/webapp/_locales.official/zh_TW/messages.json
diff --git a/remoting/webapp/me2mom/_locales/en/messages.json b/remoting/webapp/_locales/en/messages.json
index fa9613d..fa9613d 100644
--- a/remoting/webapp/me2mom/_locales/en/messages.json
+++ b/remoting/webapp/_locales/en/messages.json
diff --git a/remoting/webapp/me2mom/choice.css b/remoting/webapp/choice.css
index 4c75c89..4c75c89 100644
--- a/remoting/webapp/me2mom/choice.css
+++ b/remoting/webapp/choice.css
diff --git a/remoting/webapp/me2mom/choice.html b/remoting/webapp/choice.html
index 270896d..270896d 100644
--- a/remoting/webapp/me2mom/choice.html
+++ b/remoting/webapp/choice.html
diff --git a/remoting/webapp/me2mom/client_screen.js b/remoting/webapp/client_screen.js
index c89355d..c89355d 100644
--- a/remoting/webapp/me2mom/client_screen.js
+++ b/remoting/webapp/client_screen.js
diff --git a/remoting/webapp/me2mom/client_session.js b/remoting/webapp/client_session.js
index da57018..da57018 100644
--- a/remoting/webapp/me2mom/client_session.js
+++ b/remoting/webapp/client_session.js
diff --git a/remoting/webapp/me2mom/cs_oauth2_trampoline.js b/remoting/webapp/cs_oauth2_trampoline.js
index c4c31eb..c4c31eb 100644
--- a/remoting/webapp/me2mom/cs_oauth2_trampoline.js
+++ b/remoting/webapp/cs_oauth2_trampoline.js
diff --git a/remoting/webapp/me2mom/debug_log.css b/remoting/webapp/debug_log.css
index 3085225..3085225 100644
--- a/remoting/webapp/me2mom/debug_log.css
+++ b/remoting/webapp/debug_log.css
diff --git a/remoting/webapp/me2mom/debug_log.gtestjs b/remoting/webapp/debug_log.gtestjs
index 002f0fe..002f0fe 100644
--- a/remoting/webapp/me2mom/debug_log.gtestjs
+++ b/remoting/webapp/debug_log.gtestjs
diff --git a/remoting/webapp/me2mom/debug_log.js b/remoting/webapp/debug_log.js
index a7a13e4..a7a13e4 100644
--- a/remoting/webapp/me2mom/debug_log.js
+++ b/remoting/webapp/debug_log.js
diff --git a/remoting/webapp/me2mom/dividerbottom.png b/remoting/webapp/dividerbottom.png
index 3234694..3234694 100644
--- a/remoting/webapp/me2mom/dividerbottom.png
+++ b/remoting/webapp/dividerbottom.png
diff --git a/remoting/webapp/me2mom/dividertop.png b/remoting/webapp/dividertop.png
index 50cf995..50cf995 100644
--- a/remoting/webapp/me2mom/dividertop.png
+++ b/remoting/webapp/dividertop.png
diff --git a/remoting/webapp/me2mom/event_handlers.js b/remoting/webapp/event_handlers.js
index bafb58e..bafb58e 100644
--- a/remoting/webapp/me2mom/event_handlers.js
+++ b/remoting/webapp/event_handlers.js
diff --git a/remoting/webapp/me2mom/host_list.js b/remoting/webapp/host_list.js
index 8539f28..8539f28 100644
--- a/remoting/webapp/me2mom/host_list.js
+++ b/remoting/webapp/host_list.js
diff --git a/remoting/webapp/me2mom/host_plugin_proto.js b/remoting/webapp/host_plugin_proto.js
index a64ac46..a64ac46 100644
--- a/remoting/webapp/me2mom/host_plugin_proto.js
+++ b/remoting/webapp/host_plugin_proto.js
diff --git a/remoting/webapp/me2mom/host_screen.js b/remoting/webapp/host_screen.js
index 2af3b84..2af3b84 100644
--- a/remoting/webapp/me2mom/host_screen.js
+++ b/remoting/webapp/host_screen.js
diff --git a/remoting/webapp/me2mom/host_session.js b/remoting/webapp/host_session.js
index 7dfb95a..7dfb95a 100644
--- a/remoting/webapp/me2mom/host_session.js
+++ b/remoting/webapp/host_session.js
diff --git a/remoting/webapp/me2mom/host_table_entry.js b/remoting/webapp/host_table_entry.js
index 86e9409..86e9409 100644
--- a/remoting/webapp/me2mom/host_table_entry.js
+++ b/remoting/webapp/host_table_entry.js
diff --git a/remoting/webapp/me2mom/l10n.js b/remoting/webapp/l10n.js
index 487d1c0..487d1c0 100644
--- a/remoting/webapp/me2mom/l10n.js
+++ b/remoting/webapp/l10n.js
diff --git a/remoting/webapp/me2mom/log_to_server.js b/remoting/webapp/log_to_server.js
index 92841cc..92841cc 100644
--- a/remoting/webapp/me2mom/log_to_server.js
+++ b/remoting/webapp/log_to_server.js
diff --git a/remoting/webapp/me2mom/main.css b/remoting/webapp/main.css
index c05ad44..c05ad44 100644
--- a/remoting/webapp/me2mom/main.css
+++ b/remoting/webapp/main.css
diff --git a/remoting/webapp/me2mom/manifest.json b/remoting/webapp/manifest.json
index 9b64a6f..9b64a6f 100644
--- a/remoting/webapp/me2mom/manifest.json
+++ b/remoting/webapp/manifest.json
diff --git a/remoting/webapp/me2mom/oauth2.js b/remoting/webapp/oauth2.js
index 5f9b8e3..5f9b8e3 100644
--- a/remoting/webapp/me2mom/oauth2.js
+++ b/remoting/webapp/oauth2.js
diff --git a/remoting/webapp/me2mom/oauth2_callback.html b/remoting/webapp/oauth2_callback.html
index da5fe1b..da5fe1b 100644
--- a/remoting/webapp/me2mom/oauth2_callback.html
+++ b/remoting/webapp/oauth2_callback.html
diff --git a/remoting/webapp/me2mom/plugin_settings.js b/remoting/webapp/plugin_settings.js
index b195804..b195804 100644
--- a/remoting/webapp/me2mom/plugin_settings.js
+++ b/remoting/webapp/plugin_settings.js
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/remoting.js
index e0d843d..e0d843d 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/remoting.js
diff --git a/remoting/webapp/me2mom/scale-to-fit.png b/remoting/webapp/scale-to-fit.png
index fdb44ab..fdb44ab 100644
--- a/remoting/webapp/me2mom/scale-to-fit.png
+++ b/remoting/webapp/scale-to-fit.png
diff --git a/remoting/webapp/me2mom/server_log_entry.js b/remoting/webapp/server_log_entry.js
index ba78f66..ba78f66 100644
--- a/remoting/webapp/me2mom/server_log_entry.js
+++ b/remoting/webapp/server_log_entry.js
diff --git a/remoting/webapp/me2mom/spinner.gif b/remoting/webapp/spinner.gif
index 7cec163..7cec163 100644
--- a/remoting/webapp/me2mom/spinner.gif
+++ b/remoting/webapp/spinner.gif
diff --git a/remoting/webapp/me2mom/stats_accumulator.js b/remoting/webapp/stats_accumulator.js
index adf89c5..adf89c5 100644
--- a/remoting/webapp/me2mom/stats_accumulator.js
+++ b/remoting/webapp/stats_accumulator.js
diff --git a/remoting/webapp/me2mom/toolbar.css b/remoting/webapp/toolbar.css
index 9a56d1e..9a56d1e 100644
--- a/remoting/webapp/me2mom/toolbar.css
+++ b/remoting/webapp/toolbar.css
diff --git a/remoting/webapp/me2mom/toolbar.js b/remoting/webapp/toolbar.js
index 85ad48b..85ad48b 100644
--- a/remoting/webapp/me2mom/toolbar.js
+++ b/remoting/webapp/toolbar.js
diff --git a/remoting/webapp/me2mom/ui_mode.js b/remoting/webapp/ui_mode.js
index da0253c..da0253c 100644
--- a/remoting/webapp/me2mom/ui_mode.js
+++ b/remoting/webapp/ui_mode.js
diff --git a/remoting/webapp/me2mom/util.js b/remoting/webapp/util.js
index f6899c3..f6899c3 100644
--- a/remoting/webapp/me2mom/util.js
+++ b/remoting/webapp/util.js
diff --git a/remoting/webapp/me2mom/viewer_plugin_proto.js b/remoting/webapp/viewer_plugin_proto.js
index 18d6461..18d6461 100644
--- a/remoting/webapp/me2mom/viewer_plugin_proto.js
+++ b/remoting/webapp/viewer_plugin_proto.js
diff --git a/remoting/webapp/me2mom/wcs.js b/remoting/webapp/wcs.js
index a6e5049..a6e5049 100644
--- a/remoting/webapp/me2mom/wcs.js
+++ b/remoting/webapp/wcs.js
diff --git a/remoting/webapp/me2mom/wcs_iq_client_proto.js b/remoting/webapp/wcs_iq_client_proto.js
index 3a484260..3a484260 100644
--- a/remoting/webapp/me2mom/wcs_iq_client_proto.js
+++ b/remoting/webapp/wcs_iq_client_proto.js
diff --git a/remoting/webapp/me2mom/wcs_loader.js b/remoting/webapp/wcs_loader.js
index 54fd3cc..54fd3cc 100644
--- a/remoting/webapp/me2mom/wcs_loader.js
+++ b/remoting/webapp/wcs_loader.js
diff --git a/remoting/webapp/me2mom/xhr.js b/remoting/webapp/xhr.js
index 2a48077..2a48077 100644
--- a/remoting/webapp/me2mom/xhr.js
+++ b/remoting/webapp/xhr.js