OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 * @suppress {checkTypes} | 7 * @suppress {checkTypes} |
8 * Browser test for the scenario below: | 8 * Browser test for the scenario below: |
9 * 1. Enter full-screen mode | 9 * 1. Enter full-screen mode |
10 * 2. Move the mouse to each edge; verify that the desktop bump-scrolls. | 10 * 2. Move the mouse to each edge; verify that the desktop bump-scrolls. |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 | 84 |
85 if (!base.isAppsV2()) { | 85 if (!base.isAppsV2()) { |
86 browserTest.fail( | 86 browserTest.fail( |
87 'Bump-scroll requires full-screen, which can only be activated ' + | 87 'Bump-scroll requires full-screen, which can only be activated ' + |
88 'programmatically in apps v2.'); | 88 'programmatically in apps v2.'); |
89 } | 89 } |
90 | 90 |
91 var mockConnection = new remoting.MockConnection(); | 91 var mockConnection = new remoting.MockConnection(); |
92 | 92 |
93 function onPluginCreated(/** remoting.MockClientPlugin */ plugin) { | 93 function onPluginCreated(/** remoting.MockClientPlugin */ plugin) { |
94 plugin.mock$useDefaultBehavior(remoting.MockClientPlugin.AuthMethod.PIN); | 94 plugin.mock$useDefaultBehavior(remoting.ChromotingEvent.AuthMethod.PIN); |
95 } | 95 } |
96 mockConnection.pluginFactory().mock$setPluginCreated(onPluginCreated); | 96 mockConnection.pluginFactory().mock$setPluginCreated(onPluginCreated); |
97 | 97 |
98 | 98 |
99 function cleanup() { | 99 function cleanup() { |
100 mockConnection.restore(); | 100 mockConnection.restore(); |
101 browserTest.disconnect(); | 101 browserTest.disconnect(); |
102 } | 102 } |
103 | 103 |
104 this.testVerifyScroll().then(function() { | 104 this.testVerifyScroll().then(function() { |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
352 */ | 352 */ |
353 browserTest.Bump_Scroll.prototype.verifyNoScroll = | 353 browserTest.Bump_Scroll.prototype.verifyNoScroll = |
354 function(opt_desktopViewport) { | 354 function(opt_desktopViewport) { |
355 var desktopViewport = opt_desktopViewport || getViewportForTesting(); | 355 var desktopViewport = opt_desktopViewport || getViewportForTesting(); |
356 var bumpScroller = desktopViewport.getBumpScrollerForTesting(); | 356 var bumpScroller = desktopViewport.getBumpScrollerForTesting(); |
357 if (!bumpScroller) { | 357 if (!bumpScroller) { |
358 Promise.resolve(true); | 358 Promise.resolve(true); |
359 } | 359 } |
360 return this.verifyScroll(undefined, undefined, desktopViewport); | 360 return this.verifyScroll(undefined, undefined, desktopViewport); |
361 }; | 361 }; |
OLD | NEW |