Chromium Code Reviews| Index: ui/views/mus/mus_client.h |
| diff --git a/ui/views/mus/mus_client.h b/ui/views/mus/mus_client.h |
| index 72792a72c520077a42ff6d760307bdc04bb16de2..f35dea3d8cec12c0fc84452d92e3723a672363c1 100644 |
| --- a/ui/views/mus/mus_client.h |
| +++ b/ui/views/mus/mus_client.h |
| @@ -15,6 +15,7 @@ |
| #include "ui/aura/mus/window_tree_client_delegate.h" |
| #include "ui/base/dragdrop/os_exchange_data_provider_factory.h" |
| #include "ui/views/mus/mus_export.h" |
| +#include "ui/views/mus/mus_property_mirror.h" |
|
sky
2017/01/27 20:10:45
Forward declare?
msw
2017/01/27 21:19:25
Done.
|
| #include "ui/views/mus/screen_mus_delegate.h" |
| #include "ui/views/widget/widget.h" |
| @@ -58,8 +59,7 @@ class MusClientTestApi; |
| // MusClient establishes a connection to mus and sets up necessary state so that |
| // aura and views target mus. This class is useful for typical clients, not the |
| -// WindowManager. Most clients don't create this directly, rather use |
| -// AuraInit. |
| +// WindowManager. Most clients don't create this directly, rather use AuraInit. |
| class VIEWS_MUS_EXPORT MusClient |
| : public aura::WindowTreeClientDelegate, |
| public ScreenMusDelegate, |
| @@ -104,6 +104,13 @@ class VIEWS_MUS_EXPORT MusClient |
| void AddObserver(MusClientObserver* observer); |
| void RemoveObserver(MusClientObserver* observer); |
| + MusPropertyMirror* mus_property_mirror() { |
| + return mus_property_mirror_.get(); |
| + } |
| + void set_mus_property_mirror(std::unique_ptr<MusPropertyMirror> mirror) { |
|
sky
2017/01/27 20:10:45
As this runs a destructor I think it should be Set
msw
2017/01/27 21:19:25
Done.
|
| + mus_property_mirror_ = std::move(mirror); |
| + } |
| + |
| private: |
| friend class AuraInit; |
| friend class test::MusClientTestApi; |
| @@ -140,6 +147,7 @@ class VIEWS_MUS_EXPORT MusClient |
| std::unique_ptr<ScreenMus> screen_; |
| std::unique_ptr<aura::PropertyConverter> property_converter_; |
| + std::unique_ptr<MusPropertyMirror> mus_property_mirror_; |
| std::unique_ptr<aura::WindowTreeClient> window_tree_client_; |