content/browser/image_capture/image_capture_impl.cc - Issue 2745583005: Image Capture: move files out of content/browser/media/capture to replicate WebKit's structure

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/image_capture/image_capture_impl.cc

Issue 2745583005: Image Capture: move files out of content/browser/media/capture to replicate WebKit's structure (Closed)

Patch Set: Reverted unintended change to WATCHLISTS Created 3 years, 9 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 | « content/browser/image_capture/image_capture_impl.h ('k') | content/browser/media/capture/image_capture_impl.h » ('j') | no next file with comments »

OLD	NEW
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/image_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 "base/memory/ptr_util.h"	10 #include "base/memory/ptr_util.h"

11 #include "content/browser/browser_main_loop.h"	11 #include "content/browser/browser_main_loop.h"

12 #include "content/browser/renderer_host/media/media_stream_manager.h"	12 #include "content/browser/renderer_host/media/media_stream_manager.h"

13 #include "content/browser/renderer_host/media/video_capture_manager.h"	13 #include "content/browser/renderer_host/media/video_capture_manager.h"

14 #include "content/common/media/media_stream_options.h"	14 #include "content/common/media/media_stream_options.h"

15 #include "content/public/browser/browser_thread.h"	15 #include "content/public/browser/browser_thread.h"

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
174 media::BindToCurrentLoop(base::Bind(&RunFailedTakePhotoCallback)));	174 media::BindToCurrentLoop(base::Bind(&RunFailedTakePhotoCallback)));

175	175

176 BrowserThread::PostTask(	176 BrowserThread::PostTask(

177 BrowserThread::IO, FROM_HERE,	177 BrowserThread::IO, FROM_HERE,

178 base::Bind(&TakePhotoOnIOThread, source_id,	178 base::Bind(&TakePhotoOnIOThread, source_id,

179 BrowserMainLoop::GetInstance()->media_stream_manager(),	179 BrowserMainLoop::GetInstance()->media_stream_manager(),

180 base::Passed(&scoped_callback)));	180 base::Passed(&scoped_callback)));

181 }	181 }

182	182

183 } // namespace content	183 } // namespace content

OLD	NEW