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

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

Issue 1099383002: Change ScopedPtrHashMap's 2nd template parameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 7 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 "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id); 51 void OnSetCdm(RenderFrameHost* render_frame_host, int player_id, int cdm_id);
52 52
53 MediaPlayersObserver* GetMediaPlayersObserver() const; 53 MediaPlayersObserver* GetMediaPlayersObserver() const;
54 54
55 #if defined(VIDEO_HOLE) 55 #if defined(VIDEO_HOLE)
56 void OnFrameInfoUpdated(); 56 void OnFrameInfoUpdated();
57 #endif // defined(VIDEO_HOLE) 57 #endif // defined(VIDEO_HOLE)
58 58
59 private: 59 private:
60 // Map from RenderFrameHost* to BrowserMediaPlayerManager. 60 // Map from RenderFrameHost* to BrowserMediaPlayerManager.
61 typedef base::ScopedPtrHashMap<uintptr_t, BrowserMediaPlayerManager> 61 typedef base::ScopedPtrHashMap<uintptr_t,
62 scoped_ptr<BrowserMediaPlayerManager>>
62 MediaPlayerManagerMap; 63 MediaPlayerManagerMap;
63 MediaPlayerManagerMap media_player_managers_; 64 MediaPlayerManagerMap media_player_managers_;
64 #endif // defined(OS_ANDROID) 65 #endif // defined(OS_ANDROID)
65 66
66 private: 67 private:
67 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver); 68 DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
68 }; 69 };
69 70
70 } // namespace content 71 } // namespace content
71 72
72 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_ 73 #endif // CONTENT_BROWSER_MEDIA_MEDIA_WEB_CONTENTS_OBSERVER_H_
OLDNEW
« no previous file with comments | « content/browser/media/cdm/browser_cdm_manager.h ('k') | content/browser/renderer_host/pepper/browser_ppapi_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698