| 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/bindings/callback.h" |
| 13 #include "mojo/public/cpp/gles2/gles2.h" | |
| 14 #include "mojo/services/view_manager/view_manager_export.h" | 13 #include "mojo/services/view_manager/view_manager_export.h" |
| 15 | 14 |
| 16 namespace aura { | 15 namespace aura { |
| 17 namespace client { | 16 namespace client { |
| 18 class FocusClient; | 17 class FocusClient; |
| 19 class WindowTreeClient; | 18 class WindowTreeClient; |
| 20 } | 19 } |
| 21 class WindowTreeHost; | 20 class WindowTreeHost; |
| 22 } | 21 } |
| 23 | 22 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 46 // See description above field for details. | 45 // See description above field for details. |
| 47 bool in_setup() const { return in_setup_; } | 46 bool in_setup() const { return in_setup_; } |
| 48 | 47 |
| 49 private: | 48 private: |
| 50 void OnCompositorCreated(); | 49 void OnCompositorCreated(); |
| 51 | 50 |
| 52 RootViewManagerDelegate* delegate_; | 51 RootViewManagerDelegate* delegate_; |
| 53 | 52 |
| 54 RootNodeManager* root_node_manager_; | 53 RootNodeManager* root_node_manager_; |
| 55 | 54 |
| 56 GLES2Initializer gles_initializer_; | |
| 57 | |
| 58 // Returns true if adding the root node's window to |window_tree_host_|. | 55 // Returns true if adding the root node's window to |window_tree_host_|. |
| 59 bool in_setup_; | 56 bool in_setup_; |
| 60 | 57 |
| 61 scoped_ptr<gfx::Screen> screen_; | 58 scoped_ptr<gfx::Screen> screen_; |
| 62 scoped_ptr<aura::WindowTreeHost> window_tree_host_; | 59 scoped_ptr<aura::WindowTreeHost> window_tree_host_; |
| 63 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; | 60 scoped_ptr<aura::client::WindowTreeClient> window_tree_client_; |
| 64 scoped_ptr<aura::client::FocusClient> focus_client_; | 61 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 65 | 62 |
| 66 DISALLOW_COPY_AND_ASSIGN(RootViewManager); | 63 DISALLOW_COPY_AND_ASSIGN(RootViewManager); |
| 67 }; | 64 }; |
| 68 | 65 |
| 69 } // namespace service | 66 } // namespace service |
| 70 } // namespace mojo | 67 } // namespace mojo |
| 71 | 68 |
| 72 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ | 69 #endif // MOJO_SERVICES_VIEW_MANAGER_ROOT_VIEW_MANAGER_H_ |
| OLD | NEW |