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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/file_manager/mediaplayer.html

Issue 10068007: Implement Content Security Policy for the File Manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/file_manager/main.html ('K') | « chrome/browser/resources/file_manager/manifest.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/file_manager/mediaplayer.html
diff --git a/chrome/browser/resources/file_manager/mediaplayer.html b/chrome/browser/resources/file_manager/mediaplayer.html
index 250fb589a5bf319d0fc4f614dc1007e9052e0e51..968ea4729aa9c3309fb4a5e3da4bcf9ed782eae7 100644
--- a/chrome/browser/resources/file_manager/mediaplayer.html
+++ b/chrome/browser/resources/file_manager/mediaplayer.html
@@ -1,3 +1,8 @@
+<!--
+ -- Copyright (c) 2012 The Chromium Authors. All rights reserved.
+ -- Use of this source code is governed by a BSD-style license that can be
+ -- found in the LICENSE file.
+ -->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
@@ -6,9 +11,15 @@
<link rel="stylesheet" type="text/css" href="css/media_controls.css"/>
<link rel="stylesheet" type="text/css" href="css/audio_player.css"/>
- <script src="js/media/audio_player.js"></script>
- <script src="js/media/media_controls.js"></script>
- <script src="js/metadata/metadata_provider.js"></script>
+ <script src="js/media/mediaplayer_scripts.js"></script>
+
+ <if expr="0">
+ <!-- This file has not been flattened, load individual scripts.
+ Keep the list in sync with mediaplayer_scripts.js. -->
+ <script src="js/media/audio_player.js"></script>
+ <script src="js/media/media_controls.js"></script>
+ <script src="js/metadata/metadata_provider.js"></script>
+ </if>
</head>
<body>
<div class="audio-player"></div>
« chrome/browser/resources/file_manager/main.html ('K') | « chrome/browser/resources/file_manager/manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698