| 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 <memory> |
| 11 |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "components/mus/public/cpp/window_tree_delegate.h" | 13 #include "components/mus/public/cpp/window_tree_delegate.h" |
| 13 #include "ui/views/mus/mus_export.h" | 14 #include "ui/views/mus/mus_export.h" |
| 14 #include "ui/views/mus/screen_mus_delegate.h" | 15 #include "ui/views/mus/screen_mus_delegate.h" |
| 15 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 16 | 17 |
| 17 namespace mojo { | 18 namespace mojo { |
| 18 class Connector; | 19 class Connector; |
| 19 } | 20 } |
| 20 | 21 |
| 21 namespace views { | 22 namespace views { |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 ~WindowManagerConnection() override; | 60 ~WindowManagerConnection() override; |
| 60 | 61 |
| 61 // mus::WindowTreeDelegate: | 62 // mus::WindowTreeDelegate: |
| 62 void OnEmbed(mus::Window* root) override; | 63 void OnEmbed(mus::Window* root) override; |
| 63 void OnConnectionLost(mus::WindowTreeConnection* connection) override; | 64 void OnConnectionLost(mus::WindowTreeConnection* connection) override; |
| 64 | 65 |
| 65 // ScreenMusDelegate: | 66 // ScreenMusDelegate: |
| 66 void OnWindowManagerFrameValuesChanged() override; | 67 void OnWindowManagerFrameValuesChanged() override; |
| 67 | 68 |
| 68 mojo::Connector* connector_; | 69 mojo::Connector* connector_; |
| 69 scoped_ptr<ScreenMus> screen_; | 70 std::unique_ptr<ScreenMus> screen_; |
| 70 scoped_ptr<mus::WindowTreeConnection> window_tree_connection_; | 71 std::unique_ptr<mus::WindowTreeConnection> window_tree_connection_; |
| 71 | 72 |
| 72 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); | 73 DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection); |
| 73 }; | 74 }; |
| 74 | 75 |
| 75 } // namespace views | 76 } // namespace views |
| 76 | 77 |
| 77 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ | 78 #endif // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_ |
| OLD | NEW |