summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/extensions/media_player_api.cc
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 10:21:02 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-05 10:21:02 +0000
commit4bf3bed0a6c27a4df48fb4fd6fcf0ae6082895a0 (patch)
treed251d2f21fa175b96f756d3e9176d4dafd076b1d /chrome/browser/chromeos/extensions/media_player_api.cc
parent4620763147961c9a7587b7c27b161c0c8136bceb (diff)
downloadchromium_src-4bf3bed0a6c27a4df48fb4fd6fcf0ae6082895a0.zip
chromium_src-4bf3bed0a6c27a4df48fb4fd6fcf0ae6082895a0.tar.gz
chromium_src-4bf3bed0a6c27a4df48fb4fd6fcf0ae6082895a0.tar.bz2
Rename ProfileKeyedAPI to BrowserContextKeyedAPI and GetProfile to Get.
Move it to extensions/browser. (Not extensions/browser/api, since it's now being used not just by API implementations.) This change is purely mechanical (some lines are more affected by clang-format than others). BUG=309909 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/178193030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/extensions/media_player_api.cc')
-rw-r--r--chrome/browser/chromeos/extensions/media_player_api.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/extensions/media_player_api.cc b/chrome/browser/chromeos/extensions/media_player_api.cc
index 0651a60..86d297b 100644
--- a/chrome/browser/chromeos/extensions/media_player_api.cc
+++ b/chrome/browser/chromeos/extensions/media_player_api.cc
@@ -18,7 +18,7 @@ MediaPlayerAPI::~MediaPlayerAPI() {
// static
MediaPlayerAPI* MediaPlayerAPI::Get(content::BrowserContext* context) {
- return ProfileKeyedAPIFactory<MediaPlayerAPI>::GetForProfile(context);
+ return BrowserContextKeyedAPIFactory<MediaPlayerAPI>::Get(context);
}
MediaPlayerEventRouter* MediaPlayerAPI::media_player_event_router() {
@@ -28,11 +28,12 @@ MediaPlayerEventRouter* MediaPlayerAPI::media_player_event_router() {
return media_player_event_router_.get();
}
-static base::LazyInstance<ProfileKeyedAPIFactory<MediaPlayerAPI> >
-g_factory = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<BrowserContextKeyedAPIFactory<MediaPlayerAPI> >
+ g_factory = LAZY_INSTANCE_INITIALIZER;
// static
-ProfileKeyedAPIFactory<MediaPlayerAPI>* MediaPlayerAPI::GetFactoryInstance() {
+BrowserContextKeyedAPIFactory<MediaPlayerAPI>*
+MediaPlayerAPI::GetFactoryInstance() {
return g_factory.Pointer();
}