Skip to content

GitLab

T
tangled
Commit bf30bb4f authored by Luciano Pacheco's avatar Luciano Pacheco Committed by Commit Bot
Browse files
Options

Include utils for Polymer2 and remove /deep/ 

Bug: 875525, 884963
Change-Id: I3b3d290e2f7cc9781b7af3d3caea4508330e21ff
Reviewed-on: https://chromium-review.googlesource.com/1234118
Commit-Queue: Noel Gordon <noel@chromium.org>
Reviewed-by: default avatarNoel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592729}
parent 5f132118
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
ui/file_manager/audio_player/audio_player.html
View file @ bf30bb4f
......@@ -14,13 +14,15 @@
<link rel="stylesheet" href="chrome://resources/css/text_defaults.css">
<link rel="stylesheet" type="text/css" href="css/audio_player.css">
<script src="chrome://resources/js/util.js"></script>
<link rel="import" href="elements/audio_player.html">
<script src="js/audio_player_scripts.js"></script>
</head>
<body>
<div class="audio-player">
<!-- Place the audio player. -->
<audio-player></audio-player>
</div>
<script src="js/audio_player_scripts.js"></script>
</body>
</html>
ui/file_manager/integration_tests/audio_player/open_audio_files.js
View file @ bf30bb4f
......@@ -17,11 +17,11 @@ function openAudioPlayer(volumeName, volumeType) {
var appWindow = args[0];
return Promise.all([
remoteCallAudioPlayer.waitForElement(
appWindow, 'audio-player /deep/ track-list'),
appWindow, [['audio-player', 'track-list']]),
remoteCallAudioPlayer.waitForElement(
appWindow, 'audio-player /deep/ control-panel'),
appWindow, [['audio-player', 'control-panel']]),
remoteCallAudioPlayer.waitForElement(
appWindow, 'audio-player /deep/ audio'),
appWindow, [['audio-player', 'audio']]),
]);
});
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment