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

Side by Side Diff: chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_browsertest.js

Issue 2931243002: Unframe chrome://extensions as it's the last (and only) uber item (Closed)
Patch Set: devlin Created 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 GEN('#include "base/command_line.h"'); 5 GEN('#include "base/command_line.h"');
6 6
7 /** 7 /**
8 * TestFixture for kiosk app settings WebUI testing. 8 * TestFixture for kiosk app settings WebUI testing.
9 * @extends {testing.Test} 9 * @extends {testing.Test}
10 * @constructor 10 * @constructor
11 */ 11 */
12 function KioskAppSettingsWebUITest() {} 12 function KioskAppSettingsWebUITest() {}
13 13
14 KioskAppSettingsWebUITest.prototype = { 14 KioskAppSettingsWebUITest.prototype = {
15 __proto__: testing.Test.prototype, 15 __proto__: testing.Test.prototype,
16 16
17 /** 17 /**
18 * Browse to the kiosk app settings page. 18 * Browse to the kiosk app settings page.
19 */ 19 */
20 browsePreload: 'chrome://extensions-frame/', 20 browsePreload: 'chrome://extensions/',
21 21
22 /** @override */ 22 /** @override */
23 commandLineSwitches: [{ 23 commandLineSwitches: [{
24 switchName: 'enable-consumer-kiosk', 24 switchName: 'enable-consumer-kiosk',
25 }], 25 }],
26 26
27 /** 27 /**
28 * Mock settings data. 28 * Mock settings data.
29 * @private 29 * @private
30 */ 30 */
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 256
257 /** @override */ 257 /** @override */
258 setUp: function() {} 258 setUp: function() {}
259 }; 259 };
260 260
261 // Test kiosk app settings are not visible when consumer kiosk is disabled. 261 // Test kiosk app settings are not visible when consumer kiosk is disabled.
262 TEST_F('NoConsumerKioskWebUITest', 'settingsHidden', function() { 262 TEST_F('NoConsumerKioskWebUITest', 'settingsHidden', function() {
263 assertEquals(this.browsePreload, document.location.href); 263 assertEquals(this.browsePreload, document.location.href);
264 assertTrue($('add-kiosk-app').hidden); 264 assertTrue($('add-kiosk-app').hidden);
265 }); 265 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698