From 6dc38f7817366651d281b13e6ac0f61f9623ba7e Mon Sep 17 00:00:00 2001 From: "ccameron@chromium.org" Date: Thu, 16 Jan 2014 22:19:58 +0000 Subject: Add the UI compositor to the Mac build Move the bulk of the files in content/browser/aura to content/browser/compositor, since they're not aura-specific. Build all of those files in the Mac build, and add ui/compositor to the dependencies of the Mac build. These files will soon only be excluded from the Android build. BUG=314190 > Originally submitted: > https://codereview.chromium.org/137893007 > Then reverted: > https://codereview.chromium.org/137853019 (bug 335083) This submission has the failing test disabled. TBR=piman,danakj Review URL: https://codereview.chromium.org/140753005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245352 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/browser_main_loop.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'content/browser/browser_main_loop.cc') diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 250cb36..5f01211 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -63,7 +63,7 @@ #include "ui/base/clipboard/clipboard.h" #if defined(USE_AURA) -#include "content/browser/aura/image_transport_factory.h" +#include "content/browser/compositor/image_transport_factory.h" #endif #if defined(OS_ANDROID) -- cgit v1.1