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

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

Issue 2080513002: Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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 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 "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "content/browser/browser_main_loop.h" 8 #include "content/browser/browser_main_loop.h"
9 #include "content/browser/renderer_host/media/media_stream_manager.h" 9 #include "content/browser/renderer_host/media/media_stream_manager.h"
10 #include "content/browser/renderer_host/media/video_capture_manager.h" 10 #include "content/browser/renderer_host/media/video_capture_manager.h"
11 #include "content/common/media/media_stream_options.h" 11 #include "content/common/media/media_stream_options.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 #include "media/base/bind_to_current_loop.h" 13 #include "media/base/bind_to_current_loop.h"
14 #include "media/capture/video/video_capture_device.h" 14 #include "media/capture/video/video_capture_device.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 namespace { 18 namespace {
19 19
20 template<typename R, typename... Args>
21 void RunMojoCallback(const mojo::Callback<R(Args...)>& callback, Args... args) {
22 DCHECK_CURRENTLY_ON(BrowserThread::UI);
23 callback.Run(std::forward<Args>(args)...);
24 }
25
26 void RunFailedGetCapabilitiesCallback( 20 void RunFailedGetCapabilitiesCallback(
27 const ImageCaptureImpl::GetCapabilitiesCallback& cb) { 21 const ImageCaptureImpl::GetCapabilitiesCallback& cb) {
28 DCHECK_CURRENTLY_ON(BrowserThread::UI); 22 DCHECK_CURRENTLY_ON(BrowserThread::UI);
29 media::mojom::PhotoCapabilitiesPtr empty_capabilities = 23 media::mojom::PhotoCapabilitiesPtr empty_capabilities =
30 media::mojom::PhotoCapabilities::New(); 24 media::mojom::PhotoCapabilities::New();
31 empty_capabilities->zoom = media::mojom::Range::New(); 25 empty_capabilities->zoom = media::mojom::Range::New();
32 cb.Run(std::move(empty_capabilities)); 26 cb.Run(std::move(empty_capabilities));
33 } 27 }
34 28
35 void RunTakePhotoCallbackOnUIThread( 29 void RunTakePhotoCallbackOnUIThread(
36 const ImageCaptureImpl::TakePhotoCallback& callback, 30 const ImageCaptureImpl::TakePhotoCallback& callback,
37 mojo::String mime_type, 31 mojo::String mime_type,
38 mojo::Array<uint8_t> data) { 32 mojo::Array<uint8_t> data) {
39 BrowserThread::PostTask( 33 BrowserThread::PostTask(
40 BrowserThread::UI, FROM_HERE, 34 BrowserThread::UI, FROM_HERE,
41 base::Bind(&RunMojoCallback<void, mojo::String, mojo::Array<uint8_t>>, 35 base::Bind(callback, mime_type, base::Passed(std::move(data))));
42 callback, mime_type, base::Passed(std::move(data))));
43 } 36 }
44 37
45 void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) { 38 void RunFailedTakePhotoCallback(const ImageCaptureImpl::TakePhotoCallback& cb) {
46 DCHECK_CURRENTLY_ON(BrowserThread::UI); 39 DCHECK_CURRENTLY_ON(BrowserThread::UI);
47 cb.Run("", mojo::Array<uint8_t>()); 40 cb.Run("", mojo::Array<uint8_t>());
48 } 41 }
49 42
50 void TakePhotoOnIOThread( 43 void TakePhotoOnIOThread(
51 const mojo::String& source_id, 44 const mojo::String& source_id,
52 MediaStreamManager* media_stream_manager, 45 MediaStreamManager* media_stream_manager,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 base::Bind(&TakePhotoOnIOThread, source_id, 100 base::Bind(&TakePhotoOnIOThread, source_id,
108 BrowserMainLoop::GetInstance()->media_stream_manager(), 101 BrowserMainLoop::GetInstance()->media_stream_manager(),
109 base::Passed(&scoped_callback))); 102 base::Passed(&scoped_callback)));
110 } 103 }
111 104
112 ImageCaptureImpl::ImageCaptureImpl( 105 ImageCaptureImpl::ImageCaptureImpl(
113 mojo::InterfaceRequest<media::mojom::ImageCapture> request) 106 mojo::InterfaceRequest<media::mojom::ImageCapture> request)
114 : binding_(this, std::move(request)) {} 107 : binding_(this, std::move(request)) {}
115 108
116 } // namespace content 109 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/geolocation/geolocation_service_impl.cc ('k') | content/browser/permissions/permission_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698