content/common/gpu/media/mft_angle_video_device.h - Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h.

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: content/common/gpu/media/mft_angle_video_device.h

Issue 6825055: Include base/win/scoped_comptr.h instead of base/scoped_comptr_win.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: revert bad indentation, rebase Created 9 years, 8 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:

Index: content/common/gpu/media/mft_angle_video_device.h

diff --git a/content/common/gpu/media/mft_angle_video_device.h b/content/common/gpu/media/mft_angle_video_device.h

index 8abe461467dd08950c1d376561cb50a1ce910a82..17a48ca24cc8d98c740a84874c12ff96135d5503 100644

--- a/content/common/gpu/media/mft_angle_video_device.h

+++ b/content/common/gpu/media/mft_angle_video_device.h

@@ -5,7 +5,7 @@

#ifndef CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_

#define CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_

-#include "base/scoped_comptr_win.h"

+#include "base/win/scoped_comptr.h"

#include "content/common/gpu/media/gpu_video_device.h"

struct IDirect3DDevice9;

@@ -36,7 +36,7 @@ class MftAngleVideoDevice : public GpuVideoDevice {

scoped_refptr<media::VideoFrame> frame);

private:

- ScopedComPtr<IDirect3DDevice9, &IID_IDirect3DDevice9> device_;

+ base::win::ScopedComPtr<IDirect3DDevice9, &IID_IDirect3DDevice9> device_;

};

#endif // CONTENT_GPU_MEDIA_MFT_ANGLE_VIDEO_DEVICE_H_

« no previous file with comments | « chrome_frame/utils.cc ('k') | media/tools/mfdecoder/main.cc » ('j') | no next file with comments »