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

Side by Side Diff: remoting/webapp/browser_test/browser_test.js

Issue 952353002: Requiem for client_screen.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
OLDNEW
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 * 7 *
8 * Provides basic functionality for JavaScript based browser test. 8 * Provides basic functionality for JavaScript based browser test.
9 * 9 *
10 * To define a browser test, create a class under the browserTest namespace. 10 * To define a browser test, create a class under the browserTest namespace.
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 browserTest.disconnect = function() { 213 browserTest.disconnect = function() {
214 var AppMode = remoting.AppMode; 214 var AppMode = remoting.AppMode;
215 var finishedMode = AppMode.CLIENT_SESSION_FINISHED_ME2ME; 215 var finishedMode = AppMode.CLIENT_SESSION_FINISHED_ME2ME;
216 var finishedButton = 'client-finished-me2me-button'; 216 var finishedButton = 'client-finished-me2me-button';
217 if (remoting.desktopConnectedView.getMode() == 217 if (remoting.desktopConnectedView.getMode() ==
218 remoting.DesktopConnectedView.Mode.IT2ME) { 218 remoting.DesktopConnectedView.Mode.IT2ME) {
219 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME; 219 finishedMode = AppMode.CLIENT_SESSION_FINISHED_IT2ME;
220 finishedButton = 'client-finished-it2me-button'; 220 finishedButton = 'client-finished-it2me-button';
221 } 221 }
222 222
223 remoting.disconnect(); 223 remoting.app.disconnect();
224 224
225 return browserTest.onUIMode(finishedMode).then(function() { 225 return browserTest.onUIMode(finishedMode).then(function() {
226 browserTest.clickOnControl(finishedButton); 226 browserTest.clickOnControl(finishedButton);
227 return browserTest.onUIMode(AppMode.HOME); 227 return browserTest.onUIMode(AppMode.HOME);
228 }); 228 });
229 }; 229 };
230 230
231 /** 231 /**
232 * @param {string} pin 232 * @param {string} pin
233 * @param {?boolean} opt_expectError 233 * @param {?boolean} opt_expectError
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 */ 425 */
426 browserTest.ensureRemoteConnectionEnabled = function(pin) { 426 browserTest.ensureRemoteConnectionEnabled = function(pin) {
427 browserTest.ensureHostStartedWithPIN(pin).then(function() { 427 browserTest.ensureHostStartedWithPIN(pin).then(function() {
428 browserTest.pass(); 428 browserTest.pass();
429 }, function(reason) { 429 }, function(reason) {
430 browserTest.fail(reason); 430 browserTest.fail(reason);
431 }); 431 });
432 }; 432 };
433 433
434 browserTest.init(); 434 browserTest.init();
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698