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

Side by Side Diff: content/renderer/media/cdm/render_cdm_factory.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/render_cdm_factory.h" 5 #include "content/renderer/media/cdm/render_cdm_factory.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/logging.h" 11 #include "base/logging.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/base/cdm_config.h" 14 #include "media/base/cdm_config.h"
15 #include "media/base/cdm_promise.h" 15 #include "media/base/cdm_promise.h"
16 #include "media/base/key_systems.h" 16 #include "media/base/key_systems.h"
17 #include "media/base/media_keys.h" 17 #include "media/base/media_keys.h"
18 #include "media/cdm/aes_decryptor.h" 18 #include "media/cdm/aes_decryptor.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 #if defined(ENABLE_PEPPER_CDMS) 20 #if defined(ENABLE_PEPPER_CDMS)
21 #include "content/renderer/media/cdm/ppapi_decryptor.h" 21 #include "content/renderer/media/cdm/ppapi_decryptor.h"
22 #elif defined(ENABLE_BROWSER_CDMS) 22 #elif defined(ENABLE_BROWSER_CDMS)
23 #include "content/renderer/media/cdm/proxy_media_keys.h" 23 #include "content/renderer/media/cdm/proxy_media_keys.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 session_keys_change_cb, session_expiration_update_cb, cdm_created_cb); 88 session_keys_change_cb, session_expiration_update_cb, cdm_created_cb);
89 #else 89 #else
90 // No possible CDM to create, so fail the request. 90 // No possible CDM to create, so fail the request.
91 base::ThreadTaskRunnerHandle::Get()->PostTask( 91 base::ThreadTaskRunnerHandle::Get()->PostTask(
92 FROM_HERE, 92 FROM_HERE,
93 base::Bind(cdm_created_cb, nullptr, "Key system not supported.")); 93 base::Bind(cdm_created_cb, nullptr, "Key system not supported."));
94 #endif // defined(ENABLE_PEPPER_CDMS) 94 #endif // defined(ENABLE_PEPPER_CDMS)
95 } 95 }
96 96
97 } // namespace content 97 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/cdm/ppapi_decryptor.cc ('k') | content/renderer/media/html_video_element_capturer_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698