diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 00:35:07 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 00:35:07 +0000 |
| commit | f0260d98ae432a9eab90e4ed626e0340542f3aa3 (patch) | |
| tree | fb935c9a2e4bc8ada8239bea5fdb0ad2537d5396 /content/browser/resources | |
| parent | 064ec9ef32f134b08e9e374c5f54208cdec1bb20 (diff) | |
| download | chromium_src-f0260d98ae432a9eab90e4ed626e0340542f3aa3.zip chromium_src-f0260d98ae432a9eab90e4ed626e0340542f3aa3.tar.gz chromium_src-f0260d98ae432a9eab90e4ed626e0340542f3aa3.tar.bz2 | |
Reverting this as this broke Android tests.
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests/builds/7535/steps/content_browsertests/logs/stdio
Revert 221058 "Renamed PlayerManager to Manager."
> Renamed PlayerManager to Manager.
>
> This is an attempt to re-land https://codereview.chromium.org/23566014/
>
> TBR=scherkus@chromium.org,phajdan.jr@chromium.org
>
> BUG=260005
>
> Review URL: https://chromiumcodereview.appspot.com/23907002
TBR=tyoverby@chromium.org
Review URL: https://codereview.chromium.org/23927002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221086 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resources')
| -rw-r--r-- | content/browser/resources/media/new/media_internals.js | 2 | ||||
| -rw-r--r-- | content/browser/resources/media/new/player_manager.js (renamed from content/browser/resources/media/new/manager.js) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/resources/media/new/media_internals.js b/content/browser/resources/media/new/media_internals.js index ced99d5..67c2944 100644 --- a/content/browser/resources/media/new/media_internals.js +++ b/content/browser/resources/media/new/media_internals.js @@ -6,7 +6,7 @@ var media = {}; <include src="util.js"/> <include src="player_info.js"/> -<include src="manager.js"/> +<include src="player_manager.js"/> <include src="client_renderer.js"/> <include src="main.js"/> diff --git a/content/browser/resources/media/new/manager.js b/content/browser/resources/media/new/player_manager.js index 1ba1301..1ba1301 100644 --- a/content/browser/resources/media/new/manager.js +++ b/content/browser/resources/media/new/player_manager.js |