diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:19:58 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 22:19:58 +0000 |
| commit | 6dc38f7817366651d281b13e6ac0f61f9623ba7e (patch) | |
| tree | cab23830d7402b895ac6b32786e032028c172c2e /content/browser/browser_main_loop.cc | |
| parent | b7f06a265e0122bafa1e0af8fad897b287c2226d (diff) | |
| download | chromium_src-6dc38f7817366651d281b13e6ac0f61f9623ba7e.zip chromium_src-6dc38f7817366651d281b13e6ac0f61f9623ba7e.tar.gz chromium_src-6dc38f7817366651d281b13e6ac0f61f9623ba7e.tar.bz2 | |
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
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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) |