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 #include "ash/mus/bridge/wm_window_mus.h" | 5 #include "ash/mus/bridge/wm_window_mus.h" |
6 | 6 |
7 #include "ash/common/wm/container_finder.h" | 7 #include "ash/common/wm/container_finder.h" |
8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
9 #include "ash/common/wm_layout_manager.h" | 9 #include "ash/common/wm_layout_manager.h" |
10 #include "ash/common/wm_transient_window_observer.h" | 10 #include "ash/common/wm_transient_window_observer.h" |
(...skipping 11 matching lines...) Expand all Loading... | |
22 #include "ui/aura/mus/mus_util.h" | 22 #include "ui/aura/mus/mus_util.h" |
23 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
24 #include "ui/base/hit_test.h" | 24 #include "ui/base/hit_test.h" |
25 #include "ui/display/display.h" | 25 #include "ui/display/display.h" |
26 #include "ui/views/view.h" | 26 #include "ui/views/view.h" |
27 #include "ui/views/widget/widget.h" | 27 #include "ui/views/widget/widget.h" |
28 #include "ui/views/widget/widget_delegate.h" | 28 #include "ui/views/widget/widget_delegate.h" |
29 | 29 |
30 MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmWindowMus*); | 30 MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmWindowMus*); |
31 | 31 |
32 // TODO(sky): fully implement this. Making DVLOG as too spammy to be useful. | |
sky
2016/08/24 22:51:32
This is no longer necessary because of the defines
| |
33 #undef NOTIMPLEMENTED | |
34 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented" | |
35 | |
36 namespace { | 32 namespace { |
37 | 33 |
38 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::mus::WmWindowMus, | 34 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::mus::WmWindowMus, |
39 kWmWindowKey, | 35 kWmWindowKey, |
40 nullptr); | 36 nullptr); |
41 | 37 |
42 } // namespace | 38 } // namespace |
43 | 39 |
44 namespace ash { | 40 namespace ash { |
45 namespace mus { | 41 namespace mus { |
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
711 return this; | 707 return this; |
712 for (ui::Window* child : window_->children()) { | 708 for (ui::Window* child : window_->children()) { |
713 WmWindow* result = Get(child)->GetChildByShellWindowId(id); | 709 WmWindow* result = Get(child)->GetChildByShellWindowId(id); |
714 if (result) | 710 if (result) |
715 return result; | 711 return result; |
716 } | 712 } |
717 return nullptr; | 713 return nullptr; |
718 } | 714 } |
719 | 715 |
720 void WmWindowMus::ShowResizeShadow(int component) { | 716 void WmWindowMus::ShowResizeShadow(int component) { |
717 // TODO: http://crbug.com/640773. | |
721 NOTIMPLEMENTED(); | 718 NOTIMPLEMENTED(); |
722 } | 719 } |
723 | 720 |
724 void WmWindowMus::HideResizeShadow() { | 721 void WmWindowMus::HideResizeShadow() { |
722 // TODO: http://crbug.com/640773. | |
725 NOTIMPLEMENTED(); | 723 NOTIMPLEMENTED(); |
726 } | 724 } |
727 | 725 |
728 void WmWindowMus::InstallResizeHandleWindowTargeter( | 726 void WmWindowMus::InstallResizeHandleWindowTargeter( |
729 ImmersiveFullscreenController* immersive_fullscreen_controller) { | 727 ImmersiveFullscreenController* immersive_fullscreen_controller) { |
730 // TODO(sky): I believe once ImmersiveFullscreenController is ported this | 728 // TODO(sky): I believe once ImmersiveFullscreenController is ported this |
731 // won't be necessary in mash, but I need to verify that: | 729 // won't be necessary in mash, but I need to verify that: |
732 // http://crbug.com/548435. | 730 // http://crbug.com/548435. |
733 } | 731 } |
734 | 732 |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
872 } | 870 } |
873 | 871 |
874 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, | 872 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, |
875 ui::Window* transient) { | 873 ui::Window* transient) { |
876 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, | 874 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, |
877 OnTransientChildRemoved(this, Get(transient))); | 875 OnTransientChildRemoved(this, Get(transient))); |
878 } | 876 } |
879 | 877 |
880 } // namespace mus | 878 } // namespace mus |
881 } // namespace ash | 879 } // namespace ash |
OLD | NEW |