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

Side by Side Diff: media/capture/video/android/video_capture_device_android.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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 (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 "media/capture/video/android/video_capture_device_android.h"
6 6
7 #include <stdint.h>
8
7 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
8 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
9 #include "base/strings/string_number_conversions.h" 11 #include "base/strings/string_number_conversions.h"
10 #include "jni/VideoCapture_jni.h" 12 #include "jni/VideoCapture_jni.h"
11 #include "media/capture/video/android/video_capture_device_factory_android.h" 13 #include "media/capture/video/android/video_capture_device_factory_android.h"
12 14
13 using base::android::AttachCurrentThread; 15 using base::android::AttachCurrentThread;
14 using base::android::CheckException; 16 using base::android::CheckException;
15 using base::android::GetClass; 17 using base::android::GetClass;
16 using base::android::MethodID; 18 using base::android::MethodID;
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 const tracked_objects::Location& from_here, 199 const tracked_objects::Location& from_here,
198 const std::string& reason) { 200 const std::string& reason) {
199 { 201 {
200 base::AutoLock lock(lock_); 202 base::AutoLock lock(lock_);
201 state_ = kError; 203 state_ = kError;
202 } 204 }
203 client_->OnError(from_here, reason); 205 client_->OnError(from_here, reason);
204 } 206 }
205 207
206 } // namespace media 208 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/content/thread_safe_capture_oracle.cc ('k') | media/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698