diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:12:59 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 05:12:59 +0000 |
| commit | b7c82d74fc966922b046b53ea4ef1428cf616208 (patch) | |
| tree | 512ba643745f7113686742d70e07119c36e6d036 /content/browser/renderer_host/media/desktop_capture_device_aura.cc | |
| parent | 5f56d196352243a42d86fe9324f608d0dc1105b7 (diff) | |
| download | chromium_src-b7c82d74fc966922b046b53ea4ef1428cf616208.zip chromium_src-b7c82d74fc966922b046b53ea4ef1428cf616208.tar.gz chromium_src-b7c82d74fc966922b046b53ea4ef1428cf616208.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
Review URL: https://codereview.chromium.org/137893007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245131 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/media/desktop_capture_device_aura.cc')
| -rw-r--r-- | content/browser/renderer_host/media/desktop_capture_device_aura.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/media/desktop_capture_device_aura.cc b/content/browser/renderer_host/media/desktop_capture_device_aura.cc index 3f8b66f..03e9c89 100644 --- a/content/browser/renderer_host/media/desktop_capture_device_aura.cc +++ b/content/browser/renderer_host/media/desktop_capture_device_aura.cc @@ -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/aura/image_transport_factory.h" +#include "content/browser/compositor/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" |