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

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

Issue 1771743002: Move geolocation and permission mojoms into WebKit/public/platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
17 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/common/media/cdm_messages.h" 19 #include "content/common/media/cdm_messages.h"
20 #include "content/common/media/cdm_messages_enums.h" 20 #include "content/common/media/cdm_messages_enums.h"
21 #include "content/public/browser/browser_message_filter.h" 21 #include "content/public/browser/browser_message_filter.h"
22 #include "content/public/common/permission_status.mojom.h"
23 #include "ipc/ipc_message.h" 22 #include "ipc/ipc_message.h"
24 #include "media/base/cdm_promise.h" 23 #include "media/base/cdm_promise.h"
25 #include "media/base/eme_constants.h" 24 #include "media/base/eme_constants.h"
26 #include "media/base/media_keys.h" 25 #include "media/base/media_keys.h"
26 #include "third_party/WebKit/public/platform/modules/permissions/permission_stat us.mojom.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 media { 31 namespace media {
32 class CdmFactory; 32 class CdmFactory;
33 } 33 }
34 34
35 namespace content { 35 namespace content {
36 36
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 std::map<uint64_t, GURL> cdm_security_origin_map_; 215 std::map<uint64_t, GURL> cdm_security_origin_map_;
216 216
217 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_; 217 base::WeakPtrFactory<BrowserCdmManager> weak_ptr_factory_;
218 218
219 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager); 219 DISALLOW_COPY_AND_ASSIGN(BrowserCdmManager);
220 }; 220 };
221 221
222 } // namespace content 222 } // namespace content
223 223
224 #endif // CONTENT_BROWSER_MEDIA_CDM_BROWSER_CDM_MANAGER_H_ 224 #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