| 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" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace gfx { | 24 namespace gfx { |
| 25 class Screen; | 25 class Screen; |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace mojo { | 28 namespace mojo { |
| 29 | 29 |
| 30 class ApplicationConnection; | 30 class ApplicationConnection; |
| 31 | 31 |
| 32 namespace view_manager { | |
| 33 namespace service { | 32 namespace service { |
| 34 | 33 |
| 35 class RootNodeManager; | 34 class RootNodeManager; |
| 36 class RootViewManagerDelegate; | 35 class RootViewManagerDelegate; |
| 37 | 36 |
| 38 // RootViewManager binds the root node to an actual display. | 37 // RootViewManager binds the root node to an actual display. |
| 39 class MOJO_VIEW_MANAGER_EXPORT RootViewManager { | 38 class MOJO_VIEW_MANAGER_EXPORT RootViewManager { |
| 40 public: | 39 public: |
| 41 RootViewManager(ApplicationConnection* app_connection, | 40 RootViewManager(ApplicationConnection* app_connection, |
| 42 RootNodeManager* root_node, | 41 RootNodeManager* root_node, |
| (...skipping 18 matching lines...) Expand all Loading... |
| 61 | 60 |
| 62 scoped_ptr<gfx::Screen> screen_; | 61 scoped_ptr<gfx::Screen> screen_; |
| 63 scoped_ptr<aura::WindowTreeHost> window_tree_host_; | 62 scoped_ptr<aura::WindowTreeHost> window_tree_host_; |
| 64 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; | 63 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; |
| 65 scoped_ptr<aura::client::FocusClient> focus_client_; | 64 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 66 | 65 |
| 67 DISALLOW_COPY_AND_ASSIGN(RootViewManager); | 66 DISALLOW_COPY_AND_ASSIGN(RootViewManager); |
| 68 }; | 67 }; |
| 69 | 68 |
| 70 } // namespace service | 69 } // namespace service |
| 71 } // namespace view_manager | |
| 72 } // namespace mojo | 70 } // namespace mojo |
| 73 | 71 |
| 74 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ | 72 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ |
| OLD | NEW |