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

Side by Side Diff: media/cdm/ppapi/ppapi_cdm_adapter.h

Issue 1402413005: Rename cdm_adapter to ppapi_cdm_adapter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename flag 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
« no previous file with comments | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/ppapi_cdm_adapter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "media/cdm/api/content_decryption_module.h" 14 #include "media/cdm/api/content_decryption_module.h"
15 #include "media/cdm/cdm_wrapper.h"
15 #include "media/cdm/ppapi/cdm_helpers.h" 16 #include "media/cdm/ppapi/cdm_helpers.h"
16 #include "media/cdm/ppapi/cdm_wrapper.h"
17 #include "media/cdm/ppapi/linked_ptr.h" 17 #include "media/cdm/ppapi/linked_ptr.h"
18 #include "ppapi/c/pp_stdint.h" 18 #include "ppapi/c/pp_stdint.h"
19 #include "ppapi/c/private/pp_content_decryptor.h" 19 #include "ppapi/c/private/pp_content_decryptor.h"
20 #include "ppapi/cpp/completion_callback.h" 20 #include "ppapi/cpp/completion_callback.h"
21 #include "ppapi/cpp/private/content_decryptor_private.h" 21 #include "ppapi/cpp/private/content_decryptor_private.h"
22 #include "ppapi/cpp/var.h" 22 #include "ppapi/cpp/var.h"
23 #include "ppapi/cpp/var_array_buffer.h" 23 #include "ppapi/cpp/var_array_buffer.h"
24 #include "ppapi/utility/completion_callback_factory.h" 24 #include "ppapi/utility/completion_callback_factory.h"
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 uint32_t deferred_video_decoder_config_id_; 281 uint32_t deferred_video_decoder_config_id_;
282 282
283 uint32_t last_read_file_size_kb_; 283 uint32_t last_read_file_size_kb_;
284 bool file_size_uma_reported_; 284 bool file_size_uma_reported_;
285 285
286 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 286 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
287 }; 287 };
288 288
289 } // namespace media 289 } // namespace media
290 290
291 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 291 #endif // MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « media/cdm/ppapi/cdm_wrapper.h ('k') | media/cdm/ppapi/ppapi_cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698