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

Side by Side Diff: chrome/browser/media/android/cdm/media_drm_credential_manager.cc

Issue 1967773004: Fix include path for moved thread_task_runner_handle.h header in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393013 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 "chrome/browser/media/android/cdm/media_drm_credential_manager.h" 5 #include "chrome/browser/media/android/cdm/media_drm_credential_manager.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/scoped_java_ref.h" 8 #include "base/android/scoped_java_ref.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.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 "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
15 #include "content/public/browser/android/provision_fetcher_factory.h" 15 #include "content/public/browser/android/provision_fetcher_factory.h"
16 #include "jni/MediaDrmCredentialManager_jni.h" 16 #include "jni/MediaDrmCredentialManager_jni.h"
17 #include "media/base/android/media_drm_bridge.h" 17 #include "media/base/android/media_drm_bridge.h"
18 #include "media/base/android/provision_fetcher.h" 18 #include "media/base/android/provision_fetcher.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 21 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
22 22
23 using base::android::ScopedJavaGlobalRef; 23 using base::android::ScopedJavaGlobalRef;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 return; 107 return;
108 } 108 }
109 109
110 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb); 110 media_drm_bridge_->ResetDeviceCredentials(reset_credentials_cb);
111 } 111 }
112 112
113 // static 113 // static
114 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) { 114 bool MediaDrmCredentialManager::RegisterMediaDrmCredentialManager(JNIEnv* env) {
115 return RegisterNativesImpl(env); 115 return RegisterNativesImpl(env);
116 } 116 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698