Changing how we get the profile for filebrowser and mediaplayer popups.

Review URL: http://codereview.chromium.org/1700006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45363 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 7 insertions, 18 deletions

diff --git a/chrome/browser/dom_ui/mediaplayer_browsertest.cc b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
index 0f95715..83c2065 100644
--- a/chrome/browser/dom_ui/mediaplayer_browsertest.cc
+++ b/chrome/browser/dom_ui/mediaplayer_browsertest.cc
@@ -63,7 +63,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, Popup) {
   ui_test_utils::NavigateToURL(browser(),
                                GURL("chrome://downloads"));
   MediaPlayer* player = MediaPlayer::Get();
-  player->set_profile(browser()->profile());
   // Check that its not currently visible
   ASSERT_FALSE(IsPlayerVisible());
 
@@ -78,7 +77,6 @@ IN_PROC_BROWSER_TEST_F(MediaPlayerBrowserTest, PopupPlaylist) {
   ui_test_utils::NavigateToURL(browser(),
                                GURL("chrome://downloads"));
   MediaPlayer* player = MediaPlayer::Get();
-  player->set_profile(browser()->profile());
 
   player->EnqueueMediaURL(GetMusicTestURL());
 
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index cd362f9..12421e5 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.cc
@@ -18,6 +18,7 @@
 #include "base/weak_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
@@ -121,8 +122,6 @@ class MediaplayerHandler : public DOMMessageHandler,
   void SetCurrentPlaylist(const std::vector<GURL>& playlist, int offset);
 
  private:
-  // Profile to use when opening up new browsers.
-  Profile* profile_;
   // The current playlist of urls.
   std::vector<GURL> current_playlist_;
   // The offset into the current_playlist_ of the currently playing item.
@@ -184,8 +183,7 @@ void MediaplayerUIHTMLSource::StartDataRequest(const std::string& path,
 //
 ////////////////////////////////////////////////////////////////////////////////
 MediaplayerHandler::MediaplayerHandler(bool is_playlist)
-    : profile_(NULL),
-      current_offset_(0),
+    : current_offset_(0),
       is_playlist_(is_playlist) {
 }
 
@@ -200,7 +198,6 @@ DOMMessageHandler* MediaplayerHandler::Attach(DOMUI* dom_ui) {
           Singleton<ChromeURLDataManager>::get(),
           &ChromeURLDataManager::AddDataSource,
           make_scoped_refptr(new DOMUIFavIconSource(dom_ui->GetProfile()))));
-  profile_ = dom_ui->GetProfile();
 
   return DOMMessageHandler::Attach(dom_ui);
 }
@@ -474,7 +471,8 @@ void MediaPlayer::RemoveHandler(MediaplayerHandler* handler) {
 }
 
 void MediaPlayer::PopupPlaylist() {
-  playlist_browser_ = Browser::CreateForPopup(profile_);
+  Profile* profile = BrowserList::GetLastActive()->profile();
+  playlist_browser_ = Browser::CreateForPopup(profile);
   playlist_browser_->AddTabWithURL(
       GURL(kMediaplayerPlaylistURL), GURL(), PageTransition::LINK,
       true, -1, false, NULL);
@@ -492,7 +490,8 @@ void MediaPlayer::PopupMediaPlayer() {
         NewRunnableMethod(this, &MediaPlayer::PopupMediaPlayer));
     return;
   }
-  mediaplayer_browser_ = Browser::CreateForPopup(profile_);
+  Profile* profile = BrowserList::GetLastActive()->profile();
+  mediaplayer_browser_ = Browser::CreateForPopup(profile);
   mediaplayer_browser_->AddTabWithURL(
       GURL(kMediaplayerURL), GURL(), PageTransition::LINK,
       true, -1, false, NULL);
@@ -540,8 +539,7 @@ URLRequestJob* MediaPlayer::MaybeInterceptResponse(
 }
 
 MediaPlayer::MediaPlayer()
-    : profile_(NULL),
-      handler_(NULL),
+    : handler_(NULL),
       playlist_(NULL),
       playlist_browser_(NULL),
       mediaplayer_browser_(NULL),
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h
index 7704ef8..5f565dd 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.h
+++ b/chrome/browser/dom_ui/mediaplayer_ui.h
@@ -94,10 +94,6 @@ class MediaPlayer : public NotificationObserver,
     return Singleton<MediaPlayer>::get();
   }
 
-  // Sets the profile to use when opening up new browser
-  // windows.
-  void set_profile(Profile* profile) { profile_ = profile; }
-
  private:
   MediaPlayer();
 
@@ -112,9 +108,6 @@ class MediaPlayer : public NotificationObserver,
   // Registers the listeners for the close events on the browser windows.
   void RegisterListeners();
 
-  // Should be set via a set_profile before Popup*() is called.
-  Profile* profile_;
-
   // Set when the register handler is called.  When the media player is
   // closed, this pointer is set back to NULL.
   MediaplayerHandler* handler_;