| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/capture/video/android/video_capture_device_android.h" | 5 #include "device/capture/video/android/video_capture_device_android.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| 11 #include "base/android/jni_array.h" | 11 #include "base/android/jni_array.h" |
| 12 #include "base/android/jni_string.h" | 12 #include "base/android/jni_string.h" |
| 13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "device/capture/video/android/photo_capabilities.h" |
| 15 #include "device/capture/video/android/video_capture_device_factory_android.h" |
| 14 #include "jni/VideoCapture_jni.h" | 16 #include "jni/VideoCapture_jni.h" |
| 15 #include "media/capture/video/android/photo_capabilities.h" | |
| 16 #include "media/capture/video/android/video_capture_device_factory_android.h" | |
| 17 #include "mojo/public/cpp/bindings/string.h" | 17 #include "mojo/public/cpp/bindings/string.h" |
| 18 | 18 |
| 19 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
| 20 using base::android::CheckException; | 20 using base::android::CheckException; |
| 21 using base::android::GetClass; | 21 using base::android::GetClass; |
| 22 using base::android::MethodID; | 22 using base::android::MethodID; |
| 23 using base::android::JavaRef; | 23 using base::android::JavaRef; |
| 24 using base::android::ScopedJavaLocalRef; | 24 using base::android::ScopedJavaLocalRef; |
| 25 | 25 |
| 26 namespace media { | 26 namespace media { |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 const tracked_objects::Location& from_here, | 287 const tracked_objects::Location& from_here, |
| 288 const std::string& reason) { | 288 const std::string& reason) { |
| 289 { | 289 { |
| 290 base::AutoLock lock(lock_); | 290 base::AutoLock lock(lock_); |
| 291 state_ = kError; | 291 state_ = kError; |
| 292 } | 292 } |
| 293 client_->OnError(from_here, reason); | 293 client_->OnError(from_here, reason); |
| 294 } | 294 } |
| 295 | 295 |
| 296 } // namespace media | 296 } // namespace media |
| OLD | NEW |