diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 23:15:09 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 23:15:09 +0000 |
| commit | 1b1ae7a610c367b24272bfa12dd915a721ba3c9e (patch) | |
| tree | 2bd0150fc4df88c96e741d46edc744a43337d863 /remoting | |
| parent | 7a96f30a00a4bd7f16fb5f5dd187ca128fd70872 (diff) | |
| download | chromium_src-1b1ae7a610c367b24272bfa12dd915a721ba3c9e.zip chromium_src-1b1ae7a610c367b24272bfa12dd915a721ba3c9e.tar.gz chromium_src-1b1ae7a610c367b24272bfa12dd915a721ba3c9e.tar.bz2 | |
Enable native messaging in chromoting webapp
BUG=173509
R=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/17574007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/webapp/appsv2.patch | 8 | ||||
| -rw-r--r-- | remoting/webapp/host_native_messaging.js | 5 | ||||
| -rw-r--r-- | remoting/webapp/manifest.json | 3 |
3 files changed, 7 insertions, 9 deletions
diff --git a/remoting/webapp/appsv2.patch b/remoting/webapp/appsv2.patch index dcb2417..e2851ec 100644 --- a/remoting/webapp/appsv2.patch +++ b/remoting/webapp/appsv2.patch @@ -68,11 +68,11 @@ index d1f8d1f..67bf660 100644 "optional_permissions": [ "<all_urls>" ], -@@ -41,16 +27,20 @@ - "storage", +@@ -42,16 +28,20 @@ "clipboardRead", -- "clipboardWrite" -+ "clipboardWrite", + "clipboardWrite", +- "nativeMessaging" ++ "nativeMessaging", + "experimental" ], - "plugins": [ diff --git a/remoting/webapp/host_native_messaging.js b/remoting/webapp/host_native_messaging.js index f9d5ba7..2d6a7af 100644 --- a/remoting/webapp/host_native_messaging.js +++ b/remoting/webapp/host_native_messaging.js @@ -61,10 +61,7 @@ remoting.HostNativeMessaging.PendingReply = function(type, callback, onError) { * @return {void} Nothing. */ remoting.HostNativeMessaging.prototype.initialize = function(onDone) { - // TODO(lambroslambrou): Remove 'alwaysTrue ||' once the Chrome Remote Desktop - // native messaging API is stable. - var alwaysTrue = true; - if (alwaysTrue || !chrome.runtime.connectNative) { + if (!chrome.runtime.connectNative) { console.log('Native Messaging API not available'); onDone(false); return; diff --git a/remoting/webapp/manifest.json b/remoting/webapp/manifest.json index 92313df..91b732d 100644 --- a/remoting/webapp/manifest.json +++ b/remoting/webapp/manifest.json @@ -41,7 +41,8 @@ "https://relay.google.com/*", "storage", "clipboardRead", - "clipboardWrite" + "clipboardWrite", + "nativeMessaging" ], "plugins": [ { "path": "remoting_host_plugin.dll", "public": false }, |