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

Side by Side Diff: mojo/services/native_viewport/viewport_surface.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions 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
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_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 5 #ifndef MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
6 #define MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 6 #define MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "cc/surfaces/surface_id.h" 10 #include "cc/surfaces/surface_id.h"
(...skipping 21 matching lines...) Expand all
32 void SetWidgetId(uint64_t widget_id); 32 void SetWidgetId(uint64_t widget_id);
33 void SetSize(const gfx::Size& size); 33 void SetSize(const gfx::Size& size);
34 void SetChildId(cc::SurfaceId child_id); 34 void SetChildId(cc::SurfaceId child_id);
35 35
36 private: 36 private:
37 void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace); 37 void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
38 void BindSurfaceToNativeViewport(); 38 void BindSurfaceToNativeViewport();
39 void SubmitFrame(); 39 void SubmitFrame();
40 40
41 // SurfaceClient implementation. 41 // SurfaceClient implementation.
42 virtual void ReturnResources(Array<ReturnedResourcePtr> resources) OVERRIDE; 42 virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override;
43 43
44 SurfacePtr surface_; 44 SurfacePtr surface_;
45 Gpu* gpu_service_; 45 Gpu* gpu_service_;
46 uint64_t widget_id_; 46 uint64_t widget_id_;
47 gfx::Size size_; 47 gfx::Size size_;
48 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; 48 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_;
49 cc::SurfaceId id_; 49 cc::SurfaceId id_;
50 cc::SurfaceId child_id_; 50 cc::SurfaceId child_id_;
51 base::WeakPtrFactory<ViewportSurface> weak_factory_; 51 base::WeakPtrFactory<ViewportSurface> weak_factory_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(ViewportSurface); 53 DISALLOW_COPY_AND_ASSIGN(ViewportSurface);
54 }; 54 };
55 55
56 } // namespace mojo 56 } // namespace mojo
57 57
58 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 58 #endif // MOJO_SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
OLDNEW
« no previous file with comments | « mojo/services/native_viewport/platform_viewport_x11.cc ('k') | mojo/services/network/cookie_store_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698