| 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_ROOT_VIEW_MANAGER_H_ | 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ |
| 6 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ | 6 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "mojo/public/cpp/bindings/callback.h" |
| 12 #include "mojo/public/cpp/gles2/gles2.h" | 13 #include "mojo/public/cpp/gles2/gles2.h" |
| 13 #include "mojo/services/view_manager/view_manager_export.h" | 14 #include "mojo/services/view_manager/view_manager_export.h" |
| 14 | 15 |
| 15 namespace aura { | 16 namespace aura { |
| 16 namespace client { | 17 namespace client { |
| 17 class FocusClient; | 18 class FocusClient; |
| 18 class WindowTreeClient; | 19 class WindowTreeClient; |
| 19 } | 20 } |
| 20 class WindowTreeHost; | 21 class WindowTreeHost; |
| 21 } | 22 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 32 namespace service { | 33 namespace service { |
| 33 | 34 |
| 34 class RootNodeManager; | 35 class RootNodeManager; |
| 35 class RootViewManagerDelegate; | 36 class RootViewManagerDelegate; |
| 36 | 37 |
| 37 // RootViewManager binds the root node to an actual display. | 38 // RootViewManager binds the root node to an actual display. |
| 38 class MOJO_VIEW_MANAGER_EXPORT RootViewManager { | 39 class MOJO_VIEW_MANAGER_EXPORT RootViewManager { |
| 39 public: | 40 public: |
| 40 RootViewManager(ApplicationConnection* app_connection, | 41 RootViewManager(ApplicationConnection* app_connection, |
| 41 RootNodeManager* root_node, | 42 RootNodeManager* root_node, |
| 42 RootViewManagerDelegate* delegate); | 43 RootViewManagerDelegate* delegate, |
| 44 const Callback<void()>& native_viewport_closed_callback); |
| 43 virtual ~RootViewManager(); | 45 virtual ~RootViewManager(); |
| 44 | 46 |
| 45 // See description above field for details. | 47 // See description above field for details. |
| 46 bool in_setup() const { return in_setup_; } | 48 bool in_setup() const { return in_setup_; } |
| 47 | 49 |
| 48 private: | 50 private: |
| 49 void OnCompositorCreated(); | 51 void OnCompositorCreated(); |
| 50 | 52 |
| 51 RootViewManagerDelegate* delegate_; | 53 RootViewManagerDelegate* delegate_; |
| 52 | 54 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 63 scoped_ptr<aura::client::FocusClient> focus_client_; | 65 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 64 | 66 |
| 65 DISALLOW_COPY_AND_ASSIGN(RootViewManager); | 67 DISALLOW_COPY_AND_ASSIGN(RootViewManager); |
| 66 }; | 68 }; |
| 67 | 69 |
| 68 } // namespace service | 70 } // namespace service |
| 69 } // namespace view_manager | 71 } // namespace view_manager |
| 70 } // namespace mojo | 72 } // namespace mojo |
| 71 | 73 |
| 72 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ | 74 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ |
| OLD | NEW |