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

Side by Side Diff: content/browser/media/capture/image_capture_impl.cc

Issue 2197143002: Revert of ImageCapture: content_browsertest WebRtcImageCaptureBrowserTest CreateAndGetCapabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | content/browser/media/webrtc/webrtc_audio_debug_recordings_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/browser/media/capture/image_capture_impl.h" 5 #include "content/browser/media/capture/image_capture_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "content/browser/browser_main_loop.h" 10 #include "content/browser/browser_main_loop.h"
(...skipping 14 matching lines...) Expand all
25 BrowserThread::PostTask( 25 BrowserThread::PostTask(
26 BrowserThread::UI, FROM_HERE, 26 BrowserThread::UI, FROM_HERE,
27 base::Bind(callback, base::Passed(&capabilities))); 27 base::Bind(callback, base::Passed(&capabilities)));
28 } 28 }
29 29
30 void RunFailedGetCapabilitiesCallback( 30 void RunFailedGetCapabilitiesCallback(
31 const ImageCaptureImpl::GetCapabilitiesCallback& cb) { 31 const ImageCaptureImpl::GetCapabilitiesCallback& cb) {
32 DCHECK_CURRENTLY_ON(BrowserThread::UI); 32 DCHECK_CURRENTLY_ON(BrowserThread::UI);
33 media::mojom::PhotoCapabilitiesPtr empty_capabilities = 33 media::mojom::PhotoCapabilitiesPtr empty_capabilities =
34 media::mojom::PhotoCapabilities::New(); 34 media::mojom::PhotoCapabilities::New();
35 empty_capabilities->iso = media::mojom::Range::New();
36 empty_capabilities->width = media::mojom::Range::New();
37 empty_capabilities->height = media::mojom::Range::New();
38 empty_capabilities->zoom = media::mojom::Range::New(); 35 empty_capabilities->zoom = media::mojom::Range::New();
39 cb.Run(std::move(empty_capabilities)); 36 cb.Run(std::move(empty_capabilities));
40 } 37 }
41 38
42 void RunSetOptionsCallbackOnUIThread( 39 void RunSetOptionsCallbackOnUIThread(
43 const ImageCaptureImpl::SetOptionsCallback& callback, 40 const ImageCaptureImpl::SetOptionsCallback& callback,
44 bool success) { 41 bool success) {
45 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 42 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
46 base::Bind(callback, success)); 43 base::Bind(callback, success));
47 } 44 }
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 base::Bind(&TakePhotoOnIOThread, source_id, 166 base::Bind(&TakePhotoOnIOThread, source_id,
170 BrowserMainLoop::GetInstance()->media_stream_manager(), 167 BrowserMainLoop::GetInstance()->media_stream_manager(),
171 base::Passed(&scoped_callback))); 168 base::Passed(&scoped_callback)));
172 } 169 }
173 170
174 ImageCaptureImpl::ImageCaptureImpl( 171 ImageCaptureImpl::ImageCaptureImpl(
175 mojo::InterfaceRequest<media::mojom::ImageCapture> request) 172 mojo::InterfaceRequest<media::mojom::ImageCapture> request)
176 : binding_(this, std::move(request)) {} 173 : binding_(this, std::move(request)) {}
177 174
178 } // namespace content 175 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/webrtc/webrtc_audio_debug_recordings_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698