From 85dce086001825a2faa4e75755a669f5e08a1cad Mon Sep 17 00:00:00 2001 From: rockot Date: Thu, 12 Nov 2015 17:33:59 -0800 Subject: 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} --- components/bitmap_uploader/BUILD.gn | 2 +- components/bitmap_uploader/DEPS | 1 - components/bitmap_uploader/bitmap_uploader.cc | 2 +- components/bitmap_uploader/bitmap_uploader.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'components/bitmap_uploader') 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; -- cgit v1.1