Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Side by Side Diff: remoting/webapp/appsv2.patch

Issue 16031003: Build both v1 and v2 apps on the bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers. js 1 diff --git a/remoting/webapp/event_handlers.js b/remoting/webapp/event_handlers. js
2 index 5dfc368..f69d984 100644 2 index 5dfc368..f69d984 100644
3 --- a/event_handlers.js 3 --- a/event_handlers.js
4 +++ b/event_handlers.js 4 +++ b/event_handlers.js
5 @@ -54,7 +54,6 @@ function onLoad() { 5 @@ -54,7 +54,6 @@ function onLoad() {
6 fn: remoting.sendCtrlAltDel }, 6 fn: remoting.sendCtrlAltDel },
7 { event: 'click', id: 'send-print-screen', 7 { event: 'click', id: 'send-print-screen',
8 fn: remoting.sendPrintScreen }, 8 fn: remoting.sendPrintScreen },
9 - { event: 'click', id: 'auth-button', fn: doAuthRedirect }, 9 - { event: 'click', id: 'auth-button', fn: doAuthRedirect },
10 { event: 'click', id: 'share-button', fn: remoting.tryShare }, 10 { event: 'click', id: 'share-button', fn: remoting.tryShare },
11 { event: 'click', id: 'access-mode-button', fn: goEnterAccessCode }, 11 { event: 'click', id: 'access-mode-button', fn: goEnterAccessCode },
12 { event: 'click', id: 'cancel-share-button', fn: remoting.cancelShare }, 12 { event: 'click', id: 'cancel-share-button', fn: remoting.cancelShare },
13 @@ -104,6 +103,4 @@ function onBeforeUnload() { 13 @@ -104,6 +103,4 @@ function onBeforeUnload() {
14 } 14 }
15 15
16 window.addEventListener('load', onLoad, false); 16 window.addEventListener('load', onLoad, false);
17 -window.addEventListener('beforeunload', onBeforeUnload, false); 17 -window.addEventListener('beforeunload', onBeforeUnload, false);
18 window.addEventListener('resize', remoting.onResize, false); 18 window.addEventListener('resize', remoting.onResize, false);
19 -window.addEventListener('unload', remoting.disconnect, false); 19 -window.addEventListener('unload', remoting.disconnect, false);
20 diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controlle r.js 20 diff --git a/remoting/webapp/host_controller.js b/remoting/webapp/host_controlle r.js
21 index 83c9844..98f63c3 100644 21 index 83c9844..98f63c3 100644
22 --- a/host_controller.js 22 --- a/host_controller.js
23 +++ b/host_controller.js 23 +++ b/host_controller.js
24 @@ -356,7 +356,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = f unction(onDone) { 24 @@ -356,7 +356,7 @@ remoting.HostController.prototype.getLocalHostStateAndId = f unction(onDone) {
25 onDone(hostId); 25 onDone(hostId);
26 }; 26 };
27 try { 27 try {
28 - this.plugin_.getDaemonConfig(onConfig); 28 - this.hostDispatcher_.getDaemonVersion(printVersion);
29 + onConfig('{}'); 29 + onConfig('{}');
30 } catch (err) { 30 } catch (err) {
31 onDone(null); 31 onDone(null);
32 } 32 }
33 diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html 33 diff --git a/remoting/webapp/main.html b/remoting/webapp/main.html
34 index 061caeb..f61e532 100644 34 index 061caeb..f61e532 100644
35 --- a/main.html 35 --- a/main.html
36 +++ b/main.html 36 +++ b/main.html
37 @@ -35,6 +35,7 @@ found in the LICENSE file. 37 @@ -35,6 +35,7 @@ found in the LICENSE file.
38 <script src="host_settings.js"></script> 38 <script src="host_settings.js"></script>
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 diff --git a/remoting/webapp/xhr_proxy.js b/remoting/webapp/xhr_proxy.js 148 diff --git a/remoting/webapp/xhr_proxy.js b/remoting/webapp/xhr_proxy.js
149 index 4c45780..653b481 100644 149 index 4c45780..653b481 100644
150 --- a/xhr_proxy.js 150 --- a/xhr_proxy.js
151 +++ b/xhr_proxy.js 151 +++ b/xhr_proxy.js
152 @@ -90,4 +90,4 @@ remoting.XMLHttpRequestProxy.prototype.DONE = 4; 152 @@ -90,4 +90,4 @@ remoting.XMLHttpRequestProxy.prototype.DONE = 4;
153 153
154 // Since the WCS driver code constructs XHRs directly, the only mechanism for 154 // Since the WCS driver code constructs XHRs directly, the only mechanism for
155 // proxying them is to replace the XMLHttpRequest constructor. 155 // proxying them is to replace the XMLHttpRequest constructor.
156 -//XMLHttpRequest = remoting.XMLHttpRequestProxy; 156 -//XMLHttpRequest = remoting.XMLHttpRequestProxy;
157 +XMLHttpRequest = remoting.XMLHttpRequestProxy; 157 +XMLHttpRequest = remoting.XMLHttpRequestProxy;
OLDNEW
« no previous file with comments | « remoting/remoting.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698