OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 5 #ifndef UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 6 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 // mus::WindowTreeDelegate: | 54 // mus::WindowTreeDelegate: |
55 void OnEmbed(mus::Window* root) override; | 55 void OnEmbed(mus::Window* root) override; |
56 void OnConnectionLost(mus::WindowTreeConnection* connection) override; | 56 void OnConnectionLost(mus::WindowTreeConnection* connection) override; |
57 | 57 |
58 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, | 58 NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params, |
59 internal::NativeWidgetDelegate* delegate); | 59 internal::NativeWidgetDelegate* delegate); |
60 | 60 |
61 mojo::ApplicationImpl* app_; | 61 mojo::ApplicationImpl* app_; |
62 mus::mojom::WindowManagerPtr window_manager_; | 62 mus::mojom::WindowManagerPtr window_manager_; |
63 scoped_ptr<ui::mojo::UIInit> ui_init_; | 63 scoped_ptr<ui::mojo::UIInit> ui_init_; |
| 64 scoped_ptr<mus::WindowTreeConnection> window_tree_connection_; |
64 | 65 |
65 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 66 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
66 }; | 67 }; |
67 | 68 |
68 } // namespace views | 69 } // namespace views |
69 | 70 |
70 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 71 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
OLD | NEW |