diff options
| author | rockot <rockot@chromium.org> | 2015-11-12 17:33:59 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-13 01:34:47 +0000 |
| commit | 85dce086001825a2faa4e75755a669f5e08a1cad (patch) | |
| tree | 722de1d974f799b3d1ee1ca4c81bb8b0fa75a95d /components/bitmap_uploader | |
| parent | 415b73b1a400a994a86e6f29709aa0271e895dd5 (diff) | |
| download | chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.zip chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.gz chromium_src-85dce086001825a2faa4e75755a669f5e08a1cad.tar.bz2 | |
Move third_party/mojo/src/mojo/public to mojo/public
BUG=None
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1410053006
Cr-Commit-Position: refs/heads/master@{#359461}
Diffstat (limited to 'components/bitmap_uploader')
| -rw-r--r-- | components/bitmap_uploader/BUILD.gn | 2 | ||||
| -rw-r--r-- | components/bitmap_uploader/DEPS | 1 | ||||
| -rw-r--r-- | components/bitmap_uploader/bitmap_uploader.cc | 2 | ||||
| -rw-r--r-- | components/bitmap_uploader/bitmap_uploader.h | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/components/bitmap_uploader/BUILD.gn b/components/bitmap_uploader/BUILD.gn index 75198b5..4f48ee2 100644 --- a/components/bitmap_uploader/BUILD.gn +++ b/components/bitmap_uploader/BUILD.gn @@ -16,6 +16,6 @@ source_set("bitmap_uploader") { "//components/mus/public/cpp", "//gpu", "//mojo/converters/surfaces", - "//third_party/mojo/src/mojo/public/c/gles2", + "//mojo/public/c/gles2", ] } diff --git a/components/bitmap_uploader/DEPS b/components/bitmap_uploader/DEPS index 44c9628..8a0ec23 100644 --- a/components/bitmap_uploader/DEPS +++ b/components/bitmap_uploader/DEPS @@ -8,5 +8,4 @@ include_rules = [ "+mojo/public", "+mojo/services/network/public/interfaces", "+ui/gfx/geometry", - "+third_party/mojo/src/mojo/public", ] diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc index c2f35d1..f6525da 100644 --- a/components/bitmap_uploader/bitmap_uploader.cc +++ b/components/bitmap_uploader/bitmap_uploader.cc @@ -13,8 +13,8 @@ #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/converters/surfaces/surfaces_utils.h" +#include "mojo/public/c/gles2/gles2.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" namespace bitmap_uploader { namespace { diff --git a/components/bitmap_uploader/bitmap_uploader.h b/components/bitmap_uploader/bitmap_uploader.h index c843996..ccb4d7a 100644 --- a/components/bitmap_uploader/bitmap_uploader.h +++ b/components/bitmap_uploader/bitmap_uploader.h @@ -12,7 +12,7 @@ #include "components/mus/public/interfaces/gpu.mojom.h" #include "gpu/GLES2/gl2chromium.h" #include "gpu/GLES2/gl2extchromium.h" -#include "third_party/mojo/src/mojo/public/c/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" namespace mojo { class Shell; |