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

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

Issue 1373883003: Move geolocation and permission mojoms into components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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_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>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/containers/scoped_ptr_hash_map.h" 14 #include "base/containers/scoped_ptr_hash_map.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "components/permission/public/interfaces/permission_status.mojom.h"
17 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
18 #include "content/common/media/cdm_messages.h" 19 #include "content/common/media/cdm_messages.h"
19 #include "content/common/media/cdm_messages_enums.h" 20 #include "content/common/media/cdm_messages_enums.h"
20 #include "content/public/browser/browser_message_filter.h" 21 #include "content/public/browser/browser_message_filter.h"
21 #include "content/public/common/permission_status.mojom.h"
22 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
23 #include "media/base/browser_cdm.h" 23 #include "media/base/browser_cdm.h"
24 #include "media/base/cdm_promise.h" 24 #include "media/base/cdm_promise.h"
25 #include "media/base/eme_constants.h" 25 #include "media/base/eme_constants.h"
26 #include "media/base/media_keys.h" 26 #include "media/base/media_keys.h"
27 #include "url/gurl.h" 27 #include "url/gurl.h"
28 28
29 struct CdmHostMsg_CreateSessionAndGenerateRequest_Params; 29 struct CdmHostMsg_CreateSessionAndGenerateRequest_Params;
30 30
31 namespace content { 31 namespace content {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 std::map<uint64, GURL> cdm_security_origin_map_; 204 std::map<uint64, GURL> cdm_security_origin_map_;
205 205
206 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; 206 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
207 207
208 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); 208 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
209 }; 209 };
210 210
211 } // namespace content 211 } // namespace content
212 212
213 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 213 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_
OLDNEW
« no previous file with comments | « content/browser/geolocation/geolocation_service_impl.cc ('k') | content/browser/media/cdm/browser_cdm_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698