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

Side by Side Diff: trunk/src/chrome/browser/resources/video_player/js/video_player_scripts.js

Issue 216793013: Revert 260245 "Revert 260198 "[VideoPlayer] Browser tests for ne..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
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 // The include directives are put into Javascript-style comments to prevent 5 // The include directives are put into Javascript-style comments to prevent
6 // parsing errors in non-flattened mode. The flattener still sees them. 6 // parsing errors in non-flattened mode. The flattener still sees them.
7 // Note that this makes the flattener to comment out the first line of the 7 // Note that this makes the flattener to comment out the first line of the
8 // included file but that's all right since any javascript file should start 8 // included file but that's all right since any javascript file should start
9 // with a copyright comment anyway. 9 // with a copyright comment anyway.
10 10
11 //<include src="error_util.js"/>
12
11 //<include src="../../../../../ui/webui/resources/js/cr.js"/> 13 //<include src="../../../../../ui/webui/resources/js/cr.js"/>
12 //<include src="../../../../../ui/webui/resources/js/load_time_data.js"/> 14 //<include src="../../../../../ui/webui/resources/js/load_time_data.js"/>
13 15
14 (function() { 16 (function() {
15 'use strict'; 17 'use strict';
16 18
17 //<include src="../../file_manager/common/js/util.js"/> 19 //<include src="../../file_manager/common/js/util.js"/>
18 //<include src="../../file_manager/foreground/js/media/media_controls.js"/> 20 //<include src="../../file_manager/foreground/js/media/media_controls.js"/>
19 //<include src="../../file_manager/foreground/js/media/util.js"/> 21 //<include src="../../file_manager/foreground/js/media/util.js"/>
20 22
21 //<include src="video_player.js"/> 23 //<include src="video_player.js"/>
22 24
23 window.unload = unload; 25 window.unload = unload;
24 26
25 })(); 27 })();
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698