        { 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);

       this.tableRow.addEventListener('click', this.onConnectReference_, false);
     }
diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html
index 26fa487..d69f54e 100644
--- a/main.html
+++ b/main.html
@@ -31,6 +31,7 @@ found in the LICENSE file.
     <script src="host_screen.js"></script>
     <script src="host_session.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 a52b1da..fdae490 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,25 +2,19 @@
   "description": "__MSG_PRODUCT_DESCRIPTION__",
   "default_locale": "en",
-  "app": {
-    "launch": {
-      "local_path": "main.html"
+  "app" : {
+    "background": {
+      "scripts": ["background.js"]
     }
   },
+  "key": "chromotingappsv2",
   "icons": {
     "128": "chromoting128.png",
     "48": "chromoting48.png",
     "16": "chromoting16.png"
   },
-  "content_scripts": [
-    {

diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers.js
index 5dfc368..f69d984 100644
--- a/event_handlers.js
+++ b/event_handlers.js
@@ -57,7 +57,6 @@ function onLoad() {
         fn: remoting.sendCtrlAltDel },
       { event: 'click', id: 'send-print-screen',
         fn: remoting.sendPrintScreen },
