Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4065)

Unified Diff: chrome/browser/chromeos/media/media_player.h

Issue 10917188: Make Chrome OS Audio Player survive page reload and OS restart. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed debug trace Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/media/media_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/media/media_player.h
diff --git a/chrome/browser/chromeos/media/media_player.h b/chrome/browser/chromeos/media/media_player.h
index 7b3ee8fc1263a6298338052e34c3363a6027d95e..0d8f510f9705c292ca227618bc98b4eef3fded56 100644
--- a/chrome/browser/chromeos/media/media_player.h
+++ b/chrome/browser/chromeos/media/media_player.h
@@ -7,12 +7,7 @@
#include <vector>
-#include "base/compiler_specific.h"
#include "base/memory/singleton.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
template <typename T> struct DefaultSingletonTraits;
@@ -21,7 +16,7 @@ class FilePath;
class GURL;
class Profile;
-class MediaPlayer : public content::NotificationObserver {
+class MediaPlayer {
public:
typedef std::vector<GURL> UrlVector;
@@ -59,11 +54,6 @@ class MediaPlayer : public content::NotificationObserver {
// called from the mediaplayer itself for example.
void NotifyPlaylistChanged();
- // Used to detect when the mediaplayer is closed.
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
// Getter for the singleton.
static MediaPlayer* GetInstance();
@@ -75,19 +65,12 @@ class MediaPlayer : public content::NotificationObserver {
// The position into the current_playlist_ of the currently playing item.
int current_position_;
- bool pending_playback_request_;
-
MediaPlayer();
- GURL GetMediaPlayerUrl() const;
-
- // Browser containing the Mediaplayer. Used to force closes. This is
- // created by the PopupMediaplayer call, and is NULLed out when the window
- // is closed.
- Browser* mediaplayer_browser_;
+ static GURL GetMediaPlayerUrl();
- // Used to register for events on the windows, like to listen for closes.
- content::NotificationRegistrar registrar_;
+ // Browser containing the Mediaplayer.
+ static Browser* GetBrowser();
friend class MediaPlayerBrowserTest;
DISALLOW_COPY_AND_ASSIGN(MediaPlayer);
« no previous file with comments | « no previous file | chrome/browser/chromeos/media/media_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698