| OLD | NEW | 
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 5 #ifndef CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 
| 6 #define CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 6 #define CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 
| 7 #pragma once | 7 #pragma once | 
| 8 | 8 | 
| 9 #include <set> | 9 #include <set> | 
| 10 #include <vector> | 10 #include <vector> | 
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 82   // redirects the browser to the view URL. | 82   // redirects the browser to the view URL. | 
| 83   // Implementation of net::URLRequest::Interceptor. | 83   // Implementation of net::URLRequest::Interceptor. | 
| 84   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request); | 84   virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request); | 
| 85 | 85 | 
| 86   // Used to detect when the mediaplayer is closed. | 86   // Used to detect when the mediaplayer is closed. | 
| 87   void Observe(NotificationType type, | 87   void Observe(NotificationType type, | 
| 88                const NotificationSource& source, | 88                const NotificationSource& source, | 
| 89                const NotificationDetails& details); | 89                const NotificationDetails& details); | 
| 90 | 90 | 
| 91   // Getter for the singleton. | 91   // Getter for the singleton. | 
| 92   static MediaPlayer* Get(); | 92   static MediaPlayer* GetInstance(); | 
| 93 | 93 | 
| 94  private: | 94  private: | 
| 95   friend struct DefaultSingletonTraits<MediaPlayer>; | 95   friend struct DefaultSingletonTraits<MediaPlayer>; | 
| 96 | 96 | 
| 97   MediaPlayer(); | 97   MediaPlayer(); | 
| 98 | 98 | 
| 99   // Popup the mediaplayer, this shows the browser, and sets up its | 99   // Popup the mediaplayer, this shows the browser, and sets up its | 
| 100   // locations correctly. | 100   // locations correctly. | 
| 101   void PopupMediaPlayer(Browser* creator); | 101   void PopupMediaPlayer(Browser* creator); | 
| 102 | 102 | 
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 152 | 152 | 
| 153 class MediaplayerUI : public DOMUI { | 153 class MediaplayerUI : public DOMUI { | 
| 154  public: | 154  public: | 
| 155   explicit MediaplayerUI(TabContents* contents); | 155   explicit MediaplayerUI(TabContents* contents); | 
| 156 | 156 | 
| 157  private: | 157  private: | 
| 158   DISALLOW_COPY_AND_ASSIGN(MediaplayerUI); | 158   DISALLOW_COPY_AND_ASSIGN(MediaplayerUI); | 
| 159 }; | 159 }; | 
| 160 | 160 | 
| 161 #endif  // CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 161 #endif  // CHROME_BROWSER_DOM_UI_MEDIAPLAYER_UI_H_ | 
| OLD | NEW | 
|---|