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

Side by Side Diff: content/renderer/media/cdm/ppapi_decryptor.cc

Issue 1967823004: Fix include path for moved thread_task_runner_handle.h header in content/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: Created 4 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 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 #include "content/renderer/media/cdm/ppapi_decryptor.h" 5 #include "content/renderer/media/cdm/ppapi_decryptor.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/single_thread_task_runner.h" 13 #include "base/single_thread_task_runner.h"
14 #include "base/thread_task_runner_handle.h" 14 #include "base/threading/thread_task_runner_handle.h"
15 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
16 #include "content/renderer/pepper/content_decryptor_delegate.h" 16 #include "content/renderer/pepper/content_decryptor_delegate.h"
17 #include "content/renderer/pepper/pepper_plugin_instance_impl.h" 17 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
18 #include "media/base/audio_decoder_config.h" 18 #include "media/base/audio_decoder_config.h"
19 #include "media/base/cdm_initialized_promise.h" 19 #include "media/base/cdm_initialized_promise.h"
20 #include "media/base/cdm_key_information.h" 20 #include "media/base/cdm_key_information.h"
21 #include "media/base/data_buffer.h" 21 #include "media/base/data_buffer.h"
22 #include "media/base/decoder_buffer.h" 22 #include "media/base/decoder_buffer.h"
23 #include "media/base/key_systems.h" 23 #include "media/base/key_systems.h"
24 #include "media/base/video_decoder_config.h" 24 #include "media/base/video_decoder_config.h"
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 DCHECK(render_task_runner_->BelongsToCurrentThread()); 452 DCHECK(render_task_runner_->BelongsToCurrentThread());
453 pepper_cdm_wrapper_.reset(); 453 pepper_cdm_wrapper_.reset();
454 } 454 }
455 455
456 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() { 456 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
457 DCHECK(render_task_runner_->BelongsToCurrentThread()); 457 DCHECK(render_task_runner_->BelongsToCurrentThread());
458 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL; 458 return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
459 } 459 }
460 460
461 } // namespace content 461 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/canvas_capture_handler_unittest.cc ('k') | content/renderer/media/cdm/render_cdm_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698