trunk/src/content/browser/renderer_host/media/desktop_capture_device_aura.cc - Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

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: trunk/src/content/browser/renderer_host/media/desktop_capture_device_aura.cc

Issue 137853019: Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 11 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

« no previous file with comments | « trunk/src/content/browser/renderer_host/compositor_resize_lock_aura.cc ('k') | trunk/src/content/browser/renderer_host/render_widget_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/content/browser/renderer_host/media/desktop_capture_device_aura.cc

===================================================================

--- trunk/src/content/browser/renderer_host/media/desktop_capture_device_aura.cc (revision 245194)

+++ trunk/src/content/browser/renderer_host/media/desktop_capture_device_aura.cc (working copy)

@@ -8,7 +8,7 @@

#include "base/timer/timer.h"

#include "cc/output/copy_output_request.h"

#include "cc/output/copy_output_result.h"

-#include "content/browser/compositor/image_transport_factory.h"

+#include "content/browser/aura/image_transport_factory.h"

#include "content/browser/renderer_host/media/video_capture_device_impl.h"

#include "content/common/gpu/client/gl_helper.h"

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