| OLD | NEW | 
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/capture/video/android/video_capture_device_factory_android.h" | 5 #include "media/capture/video/android/video_capture_device_factory_android.h" | 
| 6 | 6 | 
|  | 7 #include "base/android/context_utils.h" | 
| 7 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" | 
| 8 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" | 
| 9 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" | 
| 10 #include "jni/VideoCaptureFactory_jni.h" | 11 #include "jni/VideoCaptureFactory_jni.h" | 
| 11 #include "media/capture/video/android/video_capture_device_android.h" | 12 #include "media/capture/video/android/video_capture_device_android.h" | 
| 12 | 13 | 
| 13 using base::android::AttachCurrentThread; | 14 using base::android::AttachCurrentThread; | 
| 14 using base::android::ScopedJavaLocalRef; | 15 using base::android::ScopedJavaLocalRef; | 
| 15 | 16 | 
| 16 namespace media { | 17 namespace media { | 
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130 } | 131 } | 
| 131 | 132 | 
| 132 // static | 133 // static | 
| 133 VideoCaptureDeviceFactory* | 134 VideoCaptureDeviceFactory* | 
| 134 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( | 135 VideoCaptureDeviceFactory::CreateVideoCaptureDeviceFactory( | 
| 135     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { | 136     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { | 
| 136   return new VideoCaptureDeviceFactoryAndroid(); | 137   return new VideoCaptureDeviceFactoryAndroid(); | 
| 137 } | 138 } | 
| 138 | 139 | 
| 139 }  // namespace media | 140 }  // namespace media | 
| OLD | NEW | 
|---|