diff options
| author | fsamuel <fsamuel@chromium.org> | 2016-03-16 20:00:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-17 03:01:15 +0000 |
| commit | 919cc1e06ee6e0a4ad1a217e03d5f7b912383831 (patch) | |
| tree | 0c1d3f42fe54bcf72fab78faef2ab9480f07df22 /content/browser/media | |
| parent | 765ae6a97898b49c4ae7162c3aaef4126991a2ea (diff) | |
| download | chromium_src-919cc1e06ee6e0a4ad1a217e03d5f7b912383831.zip chromium_src-919cc1e06ee6e0a4ad1a217e03d5f7b912383831.tar.gz chromium_src-919cc1e06ee6e0a4ad1a217e03d5f7b912383831.tar.bz2 | |
Move gl_helper to content/browser/compositor
content/common/gpu/client/gl_helper.{h|cc} depends on media.
It looks like it's only used by content/browser/compositor
anyway, so I moved it there.
BUG=586384
Review URL: https://codereview.chromium.org/1802383002
Cr-Commit-Position: refs/heads/master@{#381651}
Diffstat (limited to 'content/browser/media')
| -rw-r--r-- | content/browser/media/capture/aura_window_capture_machine.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/media/capture/aura_window_capture_machine.cc b/content/browser/media/capture/aura_window_capture_machine.cc index b722538..f2c4b11 100644 --- a/content/browser/media/capture/aura_window_capture_machine.cc +++ b/content/browser/media/capture/aura_window_capture_machine.cc @@ -12,9 +12,9 @@ #include "base/timer/timer.h" #include "cc/output/copy_output_request.h" #include "cc/output/copy_output_result.h" +#include "content/browser/compositor/gl_helper.h" #include "content/browser/compositor/image_transport_factory.h" #include "content/browser/media/capture/desktop_capture_device_uma_types.h" -#include "content/common/gpu/client/gl_helper.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/power_save_blocker.h" #include "media/base/video_capture_types.h" |