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

chrome/browser/chromeos/media/media_player.cc

 // Copyright (c) 2012 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/chromeos/media/media_player.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
@@ skipping 68 matching lines @@
 }
 
 void MediaPlayer::ClearPlaylist() {
   current_playlist_.clear();
 }
 
 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);
   SetPlaylistPosition(0);
   NotifyPlaylistChanged();
 }
 
 void MediaPlayer::SetPlaylistPosition(int position) {
   current_position_ = position;
 }
 
 void MediaPlayer::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_BROWSER_CLOSED);
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSED, source);
 
   if (content::Source<Browser>(source).ptr() == mediaplayer_browser_)
     mediaplayer_browser_ = NULL;
 }
 
 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.
     mediaplayer_browser_->window()->Show();
     return;
   }
 
   const gfx::Size screen = gfx::Screen::GetPrimaryMonitorSize();
   const gfx::Rect bounds(screen.width() - kPopupRight - kPopupWidth,
                          screen.height() - kPopupBottom - kPopupHeight,
                          kPopupWidth,
                          kPopupHeight);
 
   Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord();
   mediaplayer_browser_ = Browser::CreateWithParams(
       Browser::CreateParams::CreateForApp(Browser::TYPE_PANEL,
                                           kMediaPlayerAppName,
                                           bounds,
                                           profile));
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_CLOSED,
                  content::Source<Browser>(mediaplayer_browser_));
 
   mediaplayer_browser_->AddSelectedTabWithURL(GetMediaPlayerUrl(),
                                               content::PAGE_TRANSITION_LINK);
   mediaplayer_browser_->window()->Show();
 }
 
-GURL MediaPlayer::GetOriginUrl() const {
-  return file_manager_util::GetMediaPlayerUrl().GetOrigin();
-}
-
 GURL MediaPlayer::GetMediaPlayerUrl() const {
   return file_manager_util::GetMediaPlayerUrl();
 }
 
 MediaPlayer::MediaPlayer()
     : current_position_(0),
       mediaplayer_browser_(NULL) {
 };