summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/media
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 23:38:37 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-17 23:38:37 +0000
commit81c5deaba63aaddb9fcac95b4c1364f19edd6270 (patch)
tree2b965317e771857ee766aa466e241a38733c844d /chrome/browser/chromeos/media
parent58264a37861675eeeefbf7f5bc22508ca4d137d1 (diff)
downloadchromium_src-81c5deaba63aaddb9fcac95b4c1364f19edd6270.zip
chromium_src-81c5deaba63aaddb9fcac95b4c1364f19edd6270.tar.gz
chromium_src-81c5deaba63aaddb9fcac95b4c1364f19edd6270.tar.bz2
Replace FileManagerUtil class with namespace file_manager_util.
file_manager_util namespace is consistent with other utils in the codebase (platform_util, mime_util, file_util), and is the preferred way in the google style guide to do this kind of thing. The FileManagerUtil class is never initialized and has no state. BUG=None, cleanup TEST=Compiles, tests pass. Review URL: http://codereview.chromium.org/8574054 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/media')
-rw-r--r--chrome/browser/chromeos/media/media_player.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc
index a6f21fa..4a67404 100644
--- a/chrome/browser/chromeos/media/media_player.cc
+++ b/chrome/browser/chromeos/media/media_player.cc
@@ -89,8 +89,8 @@ MediaPlayer* MediaPlayer::GetInstance() {
void MediaPlayer::EnqueueMediaFile(Profile* profile,
const FilePath& file_path) {
GURL url;
- if (!FileManagerUtil::ConvertFileToFileSystemUrl(profile, file_path,
- GetOriginUrl(), &url)) {
+ if (!file_manager_util::ConvertFileToFileSystemUrl(profile, file_path,
+ GetOriginUrl(), &url)) {
}
EnqueueMediaFileUrl(url);
}
@@ -103,8 +103,8 @@ void MediaPlayer::EnqueueMediaFileUrl(const GURL& url) {
void MediaPlayer::ForcePlayMediaFile(Profile* profile,
const FilePath& file_path) {
GURL url;
- if (!FileManagerUtil::ConvertFileToFileSystemUrl(profile, file_path,
- GetOriginUrl(), &url)) {
+ if (!file_manager_util::ConvertFileToFileSystemUrl(profile, file_path,
+ GetOriginUrl(), &url)) {
return;
}
ForcePlayMediaURL(url);
@@ -286,15 +286,15 @@ net::URLRequestJob* MediaPlayer::MaybeInterceptResponse(
}
GURL MediaPlayer::GetOriginUrl() const {
- return FileManagerUtil::GetMediaPlayerUrl().GetOrigin();
+ return file_manager_util::GetMediaPlayerUrl().GetOrigin();
}
GURL MediaPlayer::GetMediaplayerPlaylistUrl() const {
- return FileManagerUtil::GetMediaPlayerPlaylistUrl();
+ return file_manager_util::GetMediaPlayerPlaylistUrl();
}
GURL MediaPlayer::GetMediaPlayerUrl() const {
- return FileManagerUtil::GetMediaPlayerUrl();
+ return file_manager_util::GetMediaPlayerUrl();
}
MediaPlayer::MediaPlayer()