summaryrefslogtreecommitdiffstats
path: root/content/browser/resources/media
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 02:30:05 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-04 02:30:05 +0000
commit69bcf82d9cb2f97457b0b4f02533505c27f1e551 (patch)
tree779d9644bfabac58108d09b2b3bd6f515064d135 /content/browser/resources/media
parentc72e1a037f0d3dc4a61cb1a26395064a7fcc2ed4 (diff)
downloadchromium_src-69bcf82d9cb2f97457b0b4f02533505c27f1e551.zip
chromium_src-69bcf82d9cb2f97457b0b4f02533505c27f1e551.tar.gz
chromium_src-69bcf82d9cb2f97457b0b4f02533505c27f1e551.tar.bz2
Rename PlayerManager to Manager.
This is an attempt to re-land https://codereview.chromium.org/23566014/ again, except now with some whitespace changes to work around http://crbug.com/284906 TBR=phajdan.jr@chromium.org BUG=260005 Review URL: https://codereview.chromium.org/23686004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/resources/media')
-rw-r--r--content/browser/resources/media/new/manager.js (renamed from content/browser/resources/media/new/player_manager.js)0
-rw-r--r--content/browser/resources/media/new/media_internals.js2
2 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/resources/media/new/player_manager.js b/content/browser/resources/media/new/manager.js
index 1ba1301..1ba1301 100644
--- a/content/browser/resources/media/new/player_manager.js
+++ b/content/browser/resources/media/new/manager.js
diff --git a/content/browser/resources/media/new/media_internals.js b/content/browser/resources/media/new/media_internals.js
index 67c2944..ced99d5 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="player_manager.js"/>
+<include src="manager.js"/>
<include src="client_renderer.js"/>
<include src="main.js"/>