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

Side by Side Diff: content/browser/media/media_web_contents_observer.h

Issue 570183002: Make the pause of video playback and video capture consistent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: also make video playback consistent Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 6 #define CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/containers/scoped_ptr_hash_map.h" 9 #include "base/containers/scoped_ptr_hash_map.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message, 49 bool OnMediaPlayerSetCdmMessageReceived(const IPC::Message& message,
50 RenderFrameHost* render_frame_host); 50 RenderFrameHost* render_frame_host);
51 51
52 // Gets the media player manager associated with |render_frame_host|. Creates 52 // Gets the media player manager associated with |render_frame_host|. Creates
53 // a new one if it doesn't exist. The caller doesn't own the returned pointer. 53 // a new one if it doesn't exist. The caller doesn't own the returned pointer.
54 BrowserMediaPlayerManager* GetMediaPlayerManager( 54 BrowserMediaPlayerManager* GetMediaPlayerManager(
55 RenderFrameHost* render_frame_host); 55 RenderFrameHost* render_frame_host);
56 56
57 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 57 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
58 58
59 // Pauses all media player.
60 void PauseVideo();
61
62 #if defined(VIDEO_HOLE) 59 #if defined(VIDEO_HOLE)
63 void OnFrameInfoUpdated(); 60 void OnFrameInfoUpdated();
64 #endif // defined(VIDEO_HOLE) 61 #endif // defined(VIDEO_HOLE)
65 62
66 #endif // defined(OS_ANDROID) 63 #endif // defined(OS_ANDROID)
67 64
68 private: 65 private:
69 // Map from RenderFrameHost* to BrowserCdmManager. 66 // Map from RenderFrameHost* to BrowserCdmManager.
70 typedef base::ScopedPtrHashMap<uintptr_t, BrowserCdmManager> CdmManagerMap; 67 typedef base::ScopedPtrHashMap<uintptr_t, BrowserCdmManager> CdmManagerMap;
71 CdmManagerMap cdm_managers_; 68 CdmManagerMap cdm_managers_;
72 69
73 #if defined(OS_ANDROID) 70 #if defined(OS_ANDROID)
74 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 71 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
75 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager> 72 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager>
76 MediaPlayerManagerMap; 73 MediaPlayerManagerMap;
77 MediaPlayerManagerMap media_player_managers_; 74 MediaPlayerManagerMap media_player_managers_;
78 #endif // defined(OS_ANDROID) 75 #endif // defined(OS_ANDROID)
79 76
80 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver); 77 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
81 }; 78 };
82 79
83 } // namespace content 80 } // namespace content
84 81
85 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 82 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698