| 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 "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "components/mus/public/cpp/window_tree_delegate.h" | 9 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 10 #include "components/mus/public/interfaces/window_manager.mojom.h" | 10 #include "components/mus/public/interfaces/window_manager.mojom.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 } | 26 } |
| 27 | 27 |
| 28 // Establishes a connection to the window manager for use by views within an | 28 // Establishes a connection to the window manager for use by views within an |
| 29 // application, and performs Aura initialization. | 29 // application, and performs Aura initialization. |
| 30 class WindowManagerConnection : public mus::WindowTreeDelegate { | 30 class WindowManagerConnection : public mus::WindowTreeDelegate { |
| 31 public: | 31 public: |
| 32 static void Create(mus::mojom::WindowManagerPtr window_manager, | 32 static void Create(mus::mojom::WindowManagerPtr window_manager, |
| 33 mojo::ApplicationImpl* app); | 33 mojo::ApplicationImpl* app); |
| 34 static WindowManagerConnection* Get(); | 34 static WindowManagerConnection* Get(); |
| 35 | 35 |
| 36 mojo::ApplicationImpl* app() { return app_; } |
| 37 |
| 36 mus::Window* NewWindow(const std::map<std::string, | 38 mus::Window* NewWindow(const std::map<std::string, |
| 37 std::vector<uint8_t>>& properties); | 39 std::vector<uint8_t>>& properties); |
| 38 | 40 |
| 39 mus::mojom::WindowManager* window_manager() { | 41 mus::mojom::WindowManager* window_manager() { |
| 40 return window_manager_.get(); | 42 return window_manager_.get(); |
| 41 } | 43 } |
| 42 | 44 |
| 43 private: | 45 private: |
| 44 WindowManagerConnection(mus::mojom::WindowManagerPtr window_manager, | 46 WindowManagerConnection(mus::mojom::WindowManagerPtr window_manager, |
| 45 mojo::ApplicationImpl* app); | 47 mojo::ApplicationImpl* app); |
| 46 ~WindowManagerConnection() override; | 48 ~WindowManagerConnection() override; |
| 47 | 49 |
| 48 // mus::WindowTreeDelegate: | 50 // mus::WindowTreeDelegate: |
| 49 void OnEmbed(mus::Window* root) override; | 51 void OnEmbed(mus::Window* root) override; |
| 50 void OnConnectionLost(mus::WindowTreeConnection* connection) override; | 52 void OnConnectionLost(mus::WindowTreeConnection* connection) override; |
| 51 | 53 |
| 52 NativeWidget* CreateNativeWidget(internal::NativeWidgetDelegate* delegate); | 54 NativeWidget* CreateNativeWidget(internal::NativeWidgetDelegate* delegate); |
| 53 | 55 |
| 54 mojo::ApplicationImpl* app_; | 56 mojo::ApplicationImpl* app_; |
| 55 mus::mojom::WindowManagerPtr window_manager_; | 57 mus::mojom::WindowManagerPtr window_manager_; |
| 56 scoped_ptr<ui::mojo::UIInit> ui_init_; | 58 scoped_ptr<ui::mojo::UIInit> ui_init_; |
| 57 | 59 |
| 58 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 60 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 59 }; | 61 }; |
| 60 | 62 |
| 61 } // namespace views | 63 } // namespace views |
| 62 | 64 |
| 63 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 65 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |