Webapp changes to support third party authentication

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
 @@ -54,7 +54,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 },
@@ skipping 25 matching lines @@
 +++ b/main.html
 @@ -35,6 +35,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
+index d1f8d1f..67bf660 100644
 --- a/manifest.json
 +++ b/manifest.json
-@@ -5,24 +5,16 @@
+@@ -5,30 +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": [
 -    {
 -      "matches": [
 -        "OAUTH2_REDIRECT_URL"
 -      ],
 -      "js": [ "cs_oauth2_trampoline.js" ]
+-    },
+-    {
+-      "matches": [
+-        "THIRD_PARTY_AUTH_REDIRECT_URL"
+-      ],
+-      "js": [ "cs_third_party_auth_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,18 +22,22 @@
-     "TALK_GADGET_HOST/talkgadget/*",
-     "https://relay.google.com/*",
+   "optional_permissions": [
+     "<all_urls>"
+   ],
+@@ -41,16 +27,20 @@
      "storage",
      "clipboardRead",
--    "clipboardWrite"
--  ],
+     "clipboardWrite",
++    "experimental"
+   ],
 -  "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"
-   ],
+-  ],
 +  "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 40 matching lines @@
 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;