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

Side by Side Diff: content/browser/media/cdm/browser_cdm_manager.h

Issue 1136663006: Remove incorrect forward declaration. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_CDM_BROWSER_CDM_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 13 matching lines...) Expand all
24 #include "media/base/eme_constants.h" 24 #include "media/base/eme_constants.h"
25 #include "media/base/media_keys.h" 25 #include "media/base/media_keys.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 namespace media { 28 namespace media {
29 class BrowserCdm; 29 class BrowserCdm;
30 } 30 }
31 31
32 namespace content { 32 namespace content {
33 33
34 struct InitializeCdmParameters;
35
36 // This class manages all CDM objects. It receives control operations from the 34 // This class manages all CDM objects. It receives control operations from the
37 // the render process, and forwards them to corresponding CDM object. Callbacks 35 // the render process, and forwards them to corresponding CDM object. Callbacks
38 // from CDM objects are converted to IPCs and then sent to the render process. 36 // from CDM objects are converted to IPCs and then sent to the render process.
39 class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter { 37 class CONTENT_EXPORT BrowserCdmManager : public BrowserMessageFilter {
40 public: 38 public:
41 // Returns the BrowserCdmManager associated with the |render_process_id|. 39 // Returns the BrowserCdmManager associated with the |render_process_id|.
42 // Returns NULL if no BrowserCdmManager is associated. 40 // Returns NULL if no BrowserCdmManager is associated.
43 static BrowserCdmManager* FromProcess(int render_process_id); 41 static BrowserCdmManager* FromProcess(int render_process_id);
44 42
45 // Constructs the BrowserCdmManager for |render_process_id| which runs on 43 // Constructs the BrowserCdmManager for |render_process_id| which runs on
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 std::map<uint64, GURL> cdm_security_origin_map_; 189 std::map<uint64, GURL> cdm_security_origin_map_;
192 190
193 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; 191 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
194 192
195 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); 193 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
196 }; 194 };
197 195
198 } // namespace content 196 } // namespace content
199 197
200 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 198 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698