OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 /** | 5 /** |
6 * @fileoverview | 6 * @fileoverview |
7 * Implements a basic UX control for a connected app remoting session. | 7 * Implements a basic UX control for a connected app remoting session. |
8 */ | 8 */ |
9 | 9 |
10 /** @suppress {duplicate} */ | 10 /** @suppress {duplicate} */ |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 this.plugin_.hostDesktop(), | 67 this.plugin_.hostDesktop(), |
68 remoting.HostDesktop.Events.shapeChanged, | 68 remoting.HostDesktop.Events.shapeChanged, |
69 remoting.windowShape.setDesktopRects.bind(remoting.windowShape)); | 69 remoting.windowShape.setDesktopRects.bind(remoting.windowShape)); |
70 | 70 |
71 var desktopSizeHook = new base.EventHook( | 71 var desktopSizeHook = new base.EventHook( |
72 this.plugin_.hostDesktop(), | 72 this.plugin_.hostDesktop(), |
73 remoting.HostDesktop.Events.sizeChanged, | 73 remoting.HostDesktop.Events.sizeChanged, |
74 this.onDesktopSizeChanged_.bind(this)); | 74 this.onDesktopSizeChanged_.bind(this)); |
75 | 75 |
76 /** @private */ | 76 /** @private */ |
77 this.disposables_ = new base.Disposables( | 77 this.disposables_ = |
78 baseView, windowShapeHook, desktopSizeHook, this.contextMenu_); | 78 new base.Disposables(baseView, windowShapeHook, desktopSizeHook, |
79 this.contextMenu_, menuAdapter); | |
Jamie
2015/05/20 02:20:36
Is this change related to this CL?
kelvinp
2015/05/20 18:12:59
Because, this change allow us to restart the AppRe
| |
79 | 80 |
80 /** @private */ | 81 /** @private */ |
81 this.supportsGoogleDrive_ = this.plugin_.hasCapability( | 82 this.supportsGoogleDrive_ = this.plugin_.hasCapability( |
82 remoting.ClientSession.Capability.GOOGLE_DRIVE); | 83 remoting.ClientSession.Capability.GOOGLE_DRIVE); |
83 | 84 |
84 this.resizeHostToClientArea_(); | 85 this.resizeHostToClientArea_(); |
85 this.plugin_.extensions().register(this); | 86 this.plugin_.extensions().register(this); |
86 }; | 87 }; |
87 | 88 |
88 /** | 89 /** |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
244 }).catch(remoting.Error.handler(function(/** remoting.Error */ error) { | 245 }).catch(remoting.Error.handler(function(/** remoting.Error */ error) { |
245 console.log('Failed to refresh access token: ' + error.toString()); | 246 console.log('Failed to refresh access token: ' + error.toString()); |
246 })); | 247 })); |
247 }; | 248 }; |
248 | 249 |
249 // The access token last received from getNewToken. Saved to ensure that we | 250 // The access token last received from getNewToken. Saved to ensure that we |
250 // get a fresh token each time. | 251 // get a fresh token each time. |
251 var previousToken_ = ''; | 252 var previousToken_ = ''; |
252 | 253 |
253 })(); | 254 })(); |
OLD | NEW |