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

Side by Side Diff: mojo/examples/surfaces_app/child_impl.h

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 | « mojo/examples/surfaces_app/child_gl_impl.h ('k') | mojo/examples/surfaces_app/surfaces_app.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_ 5 #ifndef MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
6 #define MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_ 6 #define MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
7 7
8 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
10 #include "cc/surfaces/surface_id.h" 11 #include "cc/surfaces/surface_id.h"
11 #include "cc/surfaces/surface_id_allocator.h" 12 #include "cc/surfaces/surface_id_allocator.h"
12 #include "mojo/examples/surfaces_app/child.mojom.h" 13 #include "mojo/examples/surfaces_app/child.mojom.h"
13 #include "mojo/public/cpp/bindings/string.h" 14 #include "mojo/public/cpp/bindings/string.h"
14 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h" 15 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
15 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h" 16 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
16 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h" 17 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
17 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
(...skipping 19 matching lines...) Expand all
37 class Context { 38 class Context {
38 public: 39 public:
39 virtual ApplicationConnection* ShellConnection( 40 virtual ApplicationConnection* ShellConnection(
40 const mojo::String& application_url) = 0; 41 const mojo::String& application_url) = 0;
41 }; 42 };
42 explicit ChildImpl(ApplicationConnection* surfaces_service_connection); 43 explicit ChildImpl(ApplicationConnection* surfaces_service_connection);
43 virtual ~ChildImpl(); 44 virtual ~ChildImpl();
44 45
45 // SurfaceClient implementation 46 // SurfaceClient implementation
46 virtual void ReturnResources( 47 virtual void ReturnResources(
47 Array<ReturnedResourcePtr> resources) OVERRIDE; 48 Array<ReturnedResourcePtr> resources) override;
48 49
49 private: 50 private:
50 // Child implementation. 51 // Child implementation.
51 virtual void ProduceFrame( 52 virtual void ProduceFrame(
52 ColorPtr color, 53 ColorPtr color,
53 SizePtr size, 54 SizePtr size,
54 const mojo::Callback<void(SurfaceIdPtr id)>& callback) OVERRIDE; 55 const mojo::Callback<void(SurfaceIdPtr id)>& callback) override;
55 56
56 void SurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace); 57 void SurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
57 void Draw(); 58 void Draw();
58 59
59 SkColor color_; 60 SkColor color_;
60 gfx::Size size_; 61 gfx::Size size_;
61 scoped_ptr<cc::SurfaceIdAllocator> allocator_; 62 scoped_ptr<cc::SurfaceIdAllocator> allocator_;
62 SurfacesServicePtr surfaces_service_; 63 SurfacesServicePtr surfaces_service_;
63 SurfacePtr surface_; 64 SurfacePtr surface_;
64 cc::SurfaceId id_; 65 cc::SurfaceId id_;
65 mojo::Callback<void(SurfaceIdPtr id)> produce_callback_; 66 mojo::Callback<void(SurfaceIdPtr id)> produce_callback_;
66 base::WeakPtrFactory<ChildImpl> weak_factory_; 67 base::WeakPtrFactory<ChildImpl> weak_factory_;
67 68
68 DISALLOW_COPY_AND_ASSIGN(ChildImpl); 69 DISALLOW_COPY_AND_ASSIGN(ChildImpl);
69 }; 70 };
70 71
71 } // namespace examples 72 } // namespace examples
72 } // namespace mojo 73 } // namespace mojo
73 74
74 #endif // MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_ 75 #endif // MOJO_EXAMPLES_SURFACES_APP_CHILD_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/examples/surfaces_app/child_gl_impl.h ('k') | mojo/examples/surfaces_app/surfaces_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698