Made File Manager respect the user-selected launch type (tab/pinned tab/window/fullscreen)

chrome/browser/chromeos/media/media_player.cc

Index: chrome/browser/chromeos/media/media_player.cc
diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc
index 76130b8e7e17b5d7f7ab14653daeb8ec06cdb118..98ad62b581196ae8bc8496c3c9175798ff0fc150 100644
--- a/chrome/browser/chromeos/media/media_player.cc
+++ b/chrome/browser/chromeos/media/media_player.cc
@@ -86,15 +86,6 @@ void MediaPlayer::EnqueueMediaFileUrl(const GURL& url) {
   current_playlist_.push_back(url);
 }
 
-void MediaPlayer::ForcePlayMediaFile(Profile* profile,
-                                     const FilePath& file_path) {
-  GURL url;
-  if (!file_manager_util::ConvertFileToFileSystemUrl(profile, file_path,
-                                                     GetOriginUrl(), &url))
-    return;
-  ForcePlayMediaURL(url);
-}
-
 void MediaPlayer::ForcePlayMediaURL(const GURL& url) {
   ClearPlaylist();
   EnqueueMediaFileUrl(url);
@@ -120,13 +111,12 @@ void MediaPlayer::NotifyPlaylistChanged() {
   ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPlaylistChanged();
 }
 
-void MediaPlayer::PopupMediaPlayer(Browser* creator) {
+void MediaPlayer::PopupMediaPlayer() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&MediaPlayer::PopupMediaPlayer,
-                   base::Unretained(this),  // this class is a singleton.
-                   static_cast<Browser*>(NULL)));
+                   base::Unretained(this) /*this class is a singleton*/));
     return;
   }
   if (mediaplayer_browser_) {  // Already opened.
@@ -155,10 +145,6 @@ void MediaPlayer::PopupMediaPlayer(Browser* creator) {
   mediaplayer_browser_->window()->Show();
 }
 
-GURL MediaPlayer::GetOriginUrl() const {
-  return file_manager_util::GetMediaPlayerUrl().GetOrigin();
-}
-
 GURL MediaPlayer::GetMediaPlayerUrl() const {
   return file_manager_util::GetMediaPlayerUrl();
 }