Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Side by Side Diff: components/bitmap_uploader/bitmap_uploader.h

Issue 1435063002: Eliminate third_party/mojo/src from all targets' include paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « components/bitmap_uploader/DEPS ('k') | components/bitmap_uploader/bitmap_uploader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ 5 #ifndef COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
6 #define COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ 6 #define COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
7 7
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "components/mus/public/cpp/window_surface.h" 10 #include "components/mus/public/cpp/window_surface.h"
11 #include "components/mus/public/interfaces/compositor_frame.mojom.h" 11 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
12 #include "components/mus/public/interfaces/gpu.mojom.h" 12 #include "components/mus/public/interfaces/gpu.mojom.h"
13 #include "gpu/GLES2/gl2chromium.h" 13 #include "gpu/GLES2/gl2chromium.h"
14 #include "gpu/GLES2/gl2extchromium.h" 14 #include "gpu/GLES2/gl2extchromium.h"
15 #include "mojo/public/c/gles2/gles2.h" 15 #include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"
16 16
17 namespace mojo { 17 namespace mojo {
18 class Shell; 18 class Shell;
19 } 19 }
20 20
21 namespace bitmap_uploader { 21 namespace bitmap_uploader {
22 22
23 // BitmapUploader is useful if you want to draw a bitmap or color in a 23 // BitmapUploader is useful if you want to draw a bitmap or color in a
24 // mus::Window. 24 // mus::Window.
25 class BitmapUploader : public mus::mojom::SurfaceClient { 25 class BitmapUploader : public mus::mojom::SurfaceClient {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 uint32_t local_id_; 74 uint32_t local_id_;
75 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; 75 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
76 mojo::Binding<mus::mojom::SurfaceClient> surface_client_binding_; 76 mojo::Binding<mus::mojom::SurfaceClient> surface_client_binding_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); 78 DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
79 }; 79 };
80 80
81 } // namespace bitmap_uploader 81 } // namespace bitmap_uploader
82 82
83 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_ 83 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_
OLDNEW
« no previous file with comments | « components/bitmap_uploader/DEPS ('k') | components/bitmap_uploader/bitmap_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698