Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/dom_ui/mediaplayer_ui.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/mediaplayer_ui.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 202 matching lines @@
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
 
   return DOMMessageHandler::Attach(dom_ui);
 }
 
 void MediaplayerHandler::Init(bool is_playlist, TabContents* contents) {
-  MediaPlayer* player = MediaPlayer::Get();
+  MediaPlayer* player = MediaPlayer::GetInstance();
   if (!is_playlist) {
     player->SetNewHandler(this, contents);
   } else {
     player->RegisterNewPlaylistHandler(this, contents);
   }
 }
 
 void MediaplayerHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("currentOffsetChanged",
       NewCallback(this, &MediaplayerHandler::HandleCurrentOffsetChanged));
@@ skipping 17 matching lines @@
     url_value->SetString(kPropertyPath, current_playlist_[x].url.spec());
     url_value->SetBoolean(kPropertyError, current_playlist_[x].haderror);
     urls.Append(url_value);
   }
 }
 
 void MediaplayerHandler::PlaybackMediaFile(const GURL& url) {
   current_playlist_.clear();
   current_playlist_.push_back(MediaplayerHandler::MediaUrl(url));
   FirePlaylistChanged(url.spec(), true, 0);
-  MediaPlayer::Get()->NotifyPlaylistChanged();
+  MediaPlayer::GetInstance()->NotifyPlaylistChanged();
 }
 
 const MediaplayerHandler::UrlVector& MediaplayerHandler::GetCurrentPlaylist() {
   return current_playlist_;
 }
 
 int MediaplayerHandler::GetCurrentPlaylistOffset() {
   return current_offset_;
 }
 
 void MediaplayerHandler::HandleToggleFullscreen(const ListValue* args) {
-  MediaPlayer::Get()->ToggleFullscreen();
+  MediaPlayer::GetInstance()->ToggleFullscreen();
 }
 
 void MediaplayerHandler::HandleSetCurrentPlaylistOffset(const ListValue* args) {
   int id;
   CHECK(ExtractIntegerValue(args, &id));
-  MediaPlayer::Get()->SetPlaylistOffset(id);
+  MediaPlayer::GetInstance()->SetPlaylistOffset(id);
 }
 
 void MediaplayerHandler::FirePlaylistChanged(const std::string& path,
                                              bool force,
                                              int offset) {
   DictionaryValue info_value;
   ListValue urls;
   GetPlaylistValue(urls);
   info_value.SetString(kPropertyPath, path);
   info_value.SetBoolean(kPropertyForce, force);
   info_value.SetInteger(kPropertyOffset, offset);
   dom_ui_->CallJavascriptFunction(L"playlistChanged", info_value, urls);
 }
 
 void MediaplayerHandler::SetCurrentPlaylistOffset(int offset) {
   current_offset_ = offset;
   FirePlaylistChanged(std::string(), true, current_offset_);
 }
 
 void MediaplayerHandler::SetCurrentPlaylist(
     const MediaplayerHandler::UrlVector& playlist, int offset) {
   current_playlist_ = playlist;
   current_offset_ = offset;
   FirePlaylistChanged(std::string(), false, current_offset_);
 }
 
 void MediaplayerHandler::EnqueueMediaFile(const GURL& url) {
   current_playlist_.push_back(MediaplayerHandler::MediaUrl(url));
   FirePlaylistChanged(url.spec(), false, current_offset_);
-  MediaPlayer::Get()->NotifyPlaylistChanged();
+  MediaPlayer::GetInstance()->NotifyPlaylistChanged();
 }
 
 void MediaplayerHandler::HandleCurrentOffsetChanged(const ListValue* args) {
   CHECK(ExtractIntegerValue(args, &current_offset_));
-  MediaPlayer::Get()->NotifyPlaylistChanged();
+  MediaPlayer::GetInstance()->NotifyPlaylistChanged();
 }
 
 void MediaplayerHandler::HandlePlaybackError(const ListValue* args) {
   std::string error;
   std::string url;
   // Get path string.
   if (args->GetString(0, &error))
     LOG(ERROR) << "Playback error" << error;
   if (args->GetString(1, &url)) {
     for (size_t x = 0; x < current_playlist_.size(); x++) {
       if (current_playlist_[x].url == GURL(url)) {
         current_playlist_[x].haderror = true;
       }
     }
     FirePlaylistChanged(std::string(), false, current_offset_);
   }
 }
 
 void MediaplayerHandler::HandleGetCurrentPlaylist(const ListValue* args) {
   FirePlaylistChanged(std::string(), false, current_offset_);
 }
 
 void MediaplayerHandler::HandleTogglePlaylist(const ListValue* args) {
-  MediaPlayer::Get()->TogglePlaylistWindowVisible();
+  MediaPlayer::GetInstance()->TogglePlaylistWindowVisible();
 }
 
 void MediaplayerHandler::HandleShowPlaylist(const ListValue* args) {
-  MediaPlayer::Get()->ShowPlaylistWindow();
+  MediaPlayer::GetInstance()->ShowPlaylistWindow();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Mediaplayer
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(MediaPlayer);
 
 MediaPlayer::~MediaPlayer() {
 }
 
 // static
-MediaPlayer* MediaPlayer::Get() {
+MediaPlayer* MediaPlayer::GetInstance() {
   return Singleton<MediaPlayer>::get();
 }
 
 void MediaPlayer::EnqueueMediaURL(const GURL& url, Browser* creator) {
   if (!Enabled()) {
     return;
   }
   if (handler_ == NULL) {
     unhandled_urls_.push_back(url);
     PopupMediaPlayer(creator);
@@ skipping 242 matching lines @@
       new MediaplayerUIHTMLSource(is_playlist);
 
   // Set up the chrome://mediaplayer/ source.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
           ChromeURLDataManager::GetInstance(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(html_source)));
 }