| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "ui/aura/env_observer.h" | 12 #include "ui/aura/env_observer.h" |
| 13 #include "ui/aura/mus/window_tree_host_mus.h" | 13 #include "ui/aura/mus/window_tree_host_mus.h" |
| 14 #include "ui/views/mus/mus_export.h" | 14 #include "ui/views/mus/mus_export.h" |
| 15 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" | 15 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" |
| 16 #include "ui/views/widget/widget.h" |
| 16 | 17 |
| 17 namespace views { | 18 namespace views { |
| 18 | 19 |
| 19 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus | 20 class VIEWS_MUS_EXPORT DesktopWindowTreeHostMus |
| 20 : public DesktopWindowTreeHost, | 21 : public DesktopWindowTreeHost, |
| 21 public aura::WindowTreeHostMus, | 22 public aura::WindowTreeHostMus, |
| 22 public aura::EnvObserver { | 23 public aura::EnvObserver { |
| 23 public: | 24 public: |
| 24 DesktopWindowTreeHostMus( | 25 DesktopWindowTreeHostMus( |
| 25 internal::NativeWidgetDelegate* native_widget_delegate, | 26 internal::NativeWidgetDelegate* native_widget_delegate, |
| 26 DesktopNativeWidgetAura* desktop_native_widget_aura); | 27 DesktopNativeWidgetAura* desktop_native_widget_aura, |
| 28 const Widget::InitParams& init_params); |
| 27 ~DesktopWindowTreeHostMus() override; | 29 ~DesktopWindowTreeHostMus() override; |
| 28 | 30 |
| 29 private: | 31 private: |
| 30 bool IsDocked() const; | 32 bool IsDocked() const; |
| 31 | 33 |
| 32 // DesktopWindowTreeHost: | 34 // DesktopWindowTreeHost: |
| 33 void Init(aura::Window* content_window, | 35 void Init(aura::Window* content_window, |
| 34 const Widget::InitParams& params) override; | 36 const Widget::InitParams& params) override; |
| 35 void OnNativeWidgetCreated(const Widget::InitParams& params) override; | 37 void OnNativeWidgetCreated(const Widget::InitParams& params) override; |
| 36 std::unique_ptr<corewm::Tooltip> CreateTooltip() override; | 38 std::unique_ptr<corewm::Tooltip> CreateTooltip() override; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 | 119 |
| 118 // Used so that Close() isn't immediate. | 120 // Used so that Close() isn't immediate. |
| 119 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; | 121 base::WeakPtrFactory<DesktopWindowTreeHostMus> close_widget_factory_; |
| 120 | 122 |
| 121 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); | 123 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostMus); |
| 122 }; | 124 }; |
| 123 | 125 |
| 124 } // namespace views | 126 } // namespace views |
| 125 | 127 |
| 126 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ | 128 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_MUS_H_ |
| OLD | NEW |