        { event: 'click', id: 'share-button', fn: remoting.tryShare },
        { event: 'click', id: 'access-mode-button', fn: goEnterAccessCode },
        { event: 'click', id: 'cancel-share-button', fn: remoting.cancelShare },
-@@ -124,6 +123,4 @@ function onBeforeUnload() {
+@@ -118,6 +117,4 @@ function onBeforeUnload() {
  }
  
  window.addEventListener('load', onLoad, false);

 window.addEventListener('resize', remoting.onResize, false);
-window.addEventListener('unload', remoting.disconnect, false);
diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controller.js
index 5f04bce..517696d 100644
--- a/host_controller.js
+++ b/host_controller.js
@@ -310,7 +310,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = function(onDone) {
     onDone(state, that.localHostId_);
   };
   try {

       this.tableRow.addEventListener('click', this.onConnectReference_, false);
     }
diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html
index 061caeb..f61e532 100644
--- a/main.html
+++ b/main.html
@@ -33,6 +33,7 @@ found in the LICENSE file.
     <script src="host_settings.js"></script>
     <script src="host_setup_dialog.js"></script>
     <script src="host_table_entry.js"></script>
+    <script src="identity.js"></script>
     <script src="l10n.js"></script>
     <script src="log_to_server.js"></script>
     <script src="menu_button.js"></script>
diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json
index 5be9243..39052b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,24 +5,16 @@
   "manifest_version": 2,
   "default_locale": "en",
   "app": {
-    "launch": {
-      "local_path": "main.html"
+    "background": {
+      "scripts": ["background.js"]
     }
   },
+  "key": "chromotingappsv2",
   "icons": {
     "128": "chromoting128.webp",
     "48": "chromoting48.webp",
     "16": "chromoting16.webp"
   },
-  "content_scripts": [
-    {
