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

Side by Side Diff: media/blink/webcontentdecryptionmoduleaccess_impl.cc

Issue 1965273003: Fix include path for moved thread_task_runner_handle.h header in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 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
« no previous file with comments | « media/blink/cdm_session_adapter.cc ('k') | media/blink/webmediaplayer_impl.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 #include "media/blink/webcontentdecryptionmoduleaccess_impl.h" 5 #include "media/blink/webcontentdecryptionmoduleaccess_impl.h"
6 6
7 #include <memory> 7 #include <memory>
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/single_thread_task_runner.h" 12 #include "base/single_thread_task_runner.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "media/blink/webencryptedmediaclient_impl.h" 14 #include "media/blink/webencryptedmediaclient_impl.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 // The caller owns the created cdm (passed back using |result|). 18 // The caller owns the created cdm (passed back using |result|).
19 static void CreateCdm( 19 static void CreateCdm(
20 const base::WeakPtr<WebEncryptedMediaClientImpl>& client, 20 const base::WeakPtr<WebEncryptedMediaClientImpl>& client,
21 const blink::WebString& key_system, 21 const blink::WebString& key_system,
22 const blink::WebSecurityOrigin& security_origin, 22 const blink::WebSecurityOrigin& security_origin,
23 const CdmConfig& cdm_config, 23 const CdmConfig& cdm_config,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 // blink side, copy all values needed by CreateCdm() in case the blink object 73 // blink side, copy all values needed by CreateCdm() in case the blink object
74 // gets garbage-collected. 74 // gets garbage-collected.
75 std::unique_ptr<blink::WebContentDecryptionModuleResult> result_copy( 75 std::unique_ptr<blink::WebContentDecryptionModuleResult> result_copy(
76 new blink::WebContentDecryptionModuleResult(result)); 76 new blink::WebContentDecryptionModuleResult(result));
77 base::ThreadTaskRunnerHandle::Get()->PostTask( 77 base::ThreadTaskRunnerHandle::Get()->PostTask(
78 FROM_HERE, base::Bind(&CreateCdm, client_, key_system_, security_origin_, 78 FROM_HERE, base::Bind(&CreateCdm, client_, key_system_, security_origin_,
79 cdm_config_, base::Passed(&result_copy))); 79 cdm_config_, base::Passed(&result_copy)));
80 } 80 }
81 81
82 } // namespace media 82 } // namespace media
OLDNEW
« no previous file with comments | « media/blink/cdm_session_adapter.cc ('k') | media/blink/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698