media/video/capture/mac/video_capture_device_factory_mac.mm - Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac

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

Unified Diff: media/video/capture/mac/video_capture_device_factory_mac.mm

Issue 518313003: Move Mac media glue code from media/video/capture/mac to media/base/mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Move media glue code back to base/mac and add suitable rules in build files to compile the code for… Created 6 years, 3 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 side-by-side diff with in-line comments

Download patch

« media/media.gyp ('K') | « media/video/capture/mac/video_capture_device_avfoundation_mac.h ('k') | media/video/capture/mac/video_capture_device_factory_mac_unittest.mm » ('j') | media/video/capture/mac/video_capture_device_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/capture/mac/video_capture_device_factory_mac.mm

diff --git a/media/video/capture/mac/video_capture_device_factory_mac.mm b/media/video/capture/mac/video_capture_device_factory_mac.mm

index f0efe6b760b534880623738f832b8da4934720c7..3b61b69f83363b4fe2b62ac2acc467dc5fd45564 100644

--- a/media/video/capture/mac/video_capture_device_factory_mac.mm

+++ b/media/video/capture/mac/video_capture_device_factory_mac.mm

@@ -10,7 +10,7 @@

#include "base/location.h"

#include "base/strings/string_util.h"

#include "base/task_runner_util.h"

-#import "media/video/capture/mac/avfoundation_glue.h"

+#import "media/base/mac/avfoundation_glue.h"

#include "media/video/capture/mac/video_capture_device_mac.h"

#import "media/video/capture/mac/video_capture_device_avfoundation_mac.h"

#import "media/video/capture/mac/video_capture_device_qtkit_mac.h"