media/base/mac/coremedia_glue.h - 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/base/mac/coremedia_glue.h

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

Index: media/base/mac/coremedia_glue.h

diff --git a/media/video/capture/mac/coremedia_glue.h b/media/base/mac/coremedia_glue.h

similarity index 89%

rename from media/video/capture/mac/coremedia_glue.h

rename to media/base/mac/coremedia_glue.h

index c69f279ed33b835b312745b2e0db40a34f58e1d4..2cafeeac4040b00e53d55814ce5adcd155a9400b 100644

--- a/media/video/capture/mac/coremedia_glue.h

+++ b/media/base/mac/coremedia_glue.h

@@ -2,11 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#ifndef MEDIA_VIDEO_CAPTURE_MAC_COREMEDIA_GLUE_H_

-#define MEDIA_VIDEO_CAPTURE_MAC_COREMEDIA_GLUE_H_

+#ifndef MEDIA_BASE_MAC_COREMEDIA_GLUE_H_

+#define MEDIA_BASE_MAC_COREMEDIA_GLUE_H_

-#import <CoreVideo/CoreVideo.h>

-#import <Foundation/Foundation.h>

+#include <CoreVideo/CoreVideo.h>

#include "base/basictypes.h"

#include "media/base/media_export.h"

@@ -63,4 +62,4 @@ class MEDIA_EXPORT CoreMediaGlue {

DISALLOW_IMPLICIT_CONSTRUCTORS(CoreMediaGlue);

};

-#endif // MEDIA_VIDEO_CAPTURE_MAC_COREMEDIA_GLUE_H_

+#endif // MEDIA_BASE_MAC_COREMEDIA_GLUE_H_

« media/BUILD.gn ('K') | « media/base/mac/avfoundation_glue.mm ('k') | media/base/mac/coremedia_glue.mm » ('j') | media/media.gyp » ('J')