Added survey butter-bar to web-app.

remoting/webapp/appsv2.patch

 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 },
 -      { event: 'click', id: 'auth-button', fn: doAuthRedirect },
        { 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 },
-@@ -118,6 +117,4 @@ function onBeforeUnload() {
+@@ -117,6 +116,4 @@ function onBeforeUnload() {
  }
  
  window.addEventListener('load', onLoad, false);
 -window.addEventListener('beforeunload', onBeforeUnload, 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 83c9844..98f63c3 100644
 --- a/host_controller.js
 +++ b/host_controller.js
 @@ -341,7 +341,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = function(onDone) {
      onDone(state, that.localHostId_);
    };
    try {
 -    this.plugin_.getDaemonConfig(onConfig);
 +    onConfig('{}');
    } catch (err) {
      onDone(remoting.HostController.State.NOT_IMPLEMENTED, null);
    }
 diff --git a/remoting/webapp/host_table_entry.js b/remoting/webapp/host_table_entry.js
 index 4eb09d9..6d2ce85 100644
 --- a/host_table_entry.js
 +++ b/host_table_entry.js
-@@ -191,9 +191,7 @@ remoting.HostTableEntry.prototype.updateStatus = function(opt_forEdit) {
+@@ -176,9 +176,7 @@ remoting.HostTableEntry.prototype.updateStatus = function(opt_forEdit) {
        /** @type {string} */
        var encodedHostId = encodeURIComponent(this.host.hostId)
        this.onConnectReference_ = function() {
 -        var hostUrl = chrome.extension.getURL('main.html') +
 -            '?mode=me2me&hostId=' + encodedHostId;
 -        window.location.assign(hostUrl);
 +       remoting.connectMe2Me(encodedHostId, true);
        };
        this.tableRow.addEventListener('click', this.onConnectReference_, false);
      }
@@ skipping 34 matching lines @@
 -      "matches": [
 -        "OAUTH2_REDIRECT_URL"
 -      ],
 -      "js": [ "cs_oauth2_trampoline.js" ]
 -    }
 -  ],
 -  "content_security_policy": "default-src 'self'; script-src 'self' TALK_GADGET_HOST; style-src 'self' https://fonts.googleapis.com; img-src 'self' TALK_GADGET_HOST; font-src *; connect-src 'self' OAUTH2_ACCOUNTS_HOST GOOGLE_API_HOSTS TALK_GADGET_HOST https://relay.google.com",
    "permissions": [
      "OAUTH2_ACCOUNTS_HOST/*",
      "OAUTH2_API_BASE_URL/*",
-@@ -30,17 +22,22 @@
+@@ -30,18 +22,22 @@
      "TALK_GADGET_HOST/talkgadget/*",
      "https://relay.google.com/*",
+     "storage",
      "clipboardRead",
 -    "clipboardWrite"
 -  ],
 -  "plugins": [
 -    { "path": "remoting_host_plugin.dll", "public": false },
 -    { "path": "libremoting_host_plugin.ia32.so", "public": false },
 -    { "path": "libremoting_host_plugin.x64.so", "public": false },
 -    { "path": "remoting_host_plugin.plugin", "public": false }
 +    "clipboardWrite",
-+    "experimental",
-+    "storage"
++    "experimental"
    ],
 +  "oauth2": {
 +    "client_id": "45833509441.apps.googleusercontent.com",
 +    "scopes": [
 +      "https://www.googleapis.com/auth/chromoting https://www.googleapis.com/auth/googletalk https://www.googleapis.com/auth/userinfo#email"
 +    ]
 +  },
    "requirements": {
      "plugins": {
        "npapi": false
@@ skipping 12 matching lines @@
    remoting.settings = new remoting.Settings();
    remoting.oauth2 = new remoting.OAuth2();
 -  // TODO(jamiewalch): Reinstate this when we migrate to apps v2
 -  // (http://crbug.com/ 134213).
 -  // remoting.identity = new remoting.Identity(consentRequired_);
 -  remoting.identity = remoting.oauth2;
 +  remoting.identity = new remoting.Identity(consentRequired_);
    remoting.stats = new remoting.ConnectionStats(
        document.getElementById('statistics'));
    remoting.formatIq = new remoting.FormatIq();
-@@ -118,9 +115,6 @@ remoting.initDaemonUi = function () {
+@@ -129,9 +126,6 @@ remoting.initHomeScreenUi = function () {
    document.getElementById('share-button').disabled =
        !remoting.hostController.isPluginSupported();
    remoting.setMode(remoting.AppMode.HOME);
 -  if (!remoting.oauth2.isAuthenticated()) {
 -    document.getElementById('auth-dialog').hidden = false;
 -  }
    remoting.hostSetupDialog =
        new remoting.HostSetupDialog(remoting.hostController);
    // Display the cached host list, then asynchronously update and re-display it.
 diff --git a/remoting/webapp/xhr_proxy.js b/remoting/webapp/xhr_proxy.js
 index 4c45780..653b481 100644
 --- a/xhr_proxy.js
 +++ b/xhr_proxy.js
 @@ -90,4 +90,4 @@ remoting.XMLHttpRequestProxy.prototype.DONE = 4;
 
  // Since the WCS driver code constructs XHRs directly, the only mechanism for
  // proxying them is to replace the XMLHttpRequest constructor.
 -//XMLHttpRequest = remoting.XMLHttpRequestProxy;
 +XMLHttpRequest = remoting.XMLHttpRequestProxy;