| OLD | NEW |
| 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_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
| 6 #define MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 6 #define MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 // See description above field for details. | 48 // See description above field for details. |
| 49 bool in_setup() const { return in_setup_; } | 49 bool in_setup() const { return in_setup_; } |
| 50 | 50 |
| 51 private: | 51 private: |
| 52 void OnCreatedNativeViewport(uint64_t native_viewport_id); | 52 void OnCreatedNativeViewport(uint64_t native_viewport_id); |
| 53 void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace); | 53 void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace); |
| 54 void Draw(); | 54 void Draw(); |
| 55 | 55 |
| 56 // NativeViewportClient implementation. | 56 // NativeViewportClient implementation. |
| 57 virtual void OnDestroyed() OVERRIDE; | 57 virtual void OnDestroyed() override; |
| 58 virtual void OnSizeChanged(SizePtr size) OVERRIDE; | 58 virtual void OnSizeChanged(SizePtr size) override; |
| 59 virtual void OnEvent(EventPtr event, | 59 virtual void OnEvent(EventPtr event, |
| 60 const mojo::Callback<void()>& callback) OVERRIDE; | 60 const mojo::Callback<void()>& callback) override; |
| 61 | 61 |
| 62 // SurfaceClient implementation. | 62 // SurfaceClient implementation. |
| 63 virtual void ReturnResources(Array<ReturnedResourcePtr> resources) OVERRIDE; | 63 virtual void ReturnResources(Array<ReturnedResourcePtr> resources) override; |
| 64 | 64 |
| 65 ConnectionManager* connection_manager_; | 65 ConnectionManager* connection_manager_; |
| 66 | 66 |
| 67 // Returns true if adding the root view's window to |window_tree_host_|. | 67 // Returns true if adding the root view's window to |window_tree_host_|. |
| 68 bool in_setup_; | 68 bool in_setup_; |
| 69 | 69 |
| 70 gfx::Size size_; | 70 gfx::Size size_; |
| 71 gfx::Rect dirty_rect_; | 71 gfx::Rect dirty_rect_; |
| 72 base::Timer draw_timer_; | 72 base::Timer draw_timer_; |
| 73 | 73 |
| 74 SurfacesServicePtr surfaces_service_; | 74 SurfacesServicePtr surfaces_service_; |
| 75 SurfacePtr surface_; | 75 SurfacePtr surface_; |
| 76 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; | 76 scoped_ptr<cc::SurfaceIdAllocator> surface_id_allocator_; |
| 77 cc::SurfaceId surface_id_; | 77 cc::SurfaceId surface_id_; |
| 78 NativeViewportPtr native_viewport_; | 78 NativeViewportPtr native_viewport_; |
| 79 Callback<void()> native_viewport_closed_callback_; | 79 Callback<void()> native_viewport_closed_callback_; |
| 80 base::WeakPtrFactory<DisplayManager> weak_factory_; | 80 base::WeakPtrFactory<DisplayManager> weak_factory_; |
| 81 | 81 |
| 82 DISALLOW_COPY_AND_ASSIGN(DisplayManager); | 82 DISALLOW_COPY_AND_ASSIGN(DisplayManager); |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } // namespace service | 85 } // namespace service |
| 86 } // namespace mojo | 86 } // namespace mojo |
| 87 | 87 |
| 88 #endif // MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ | 88 #endif // MOJO_SERVICES_VIEW_MANAGER_DISPLAY_MANAGER_H_ |
| OLD | NEW |