Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Side by Side Diff: ash/mus/bridge/wm_window_mus.cc

Issue 2182633011: Replaces ::ui:: with ui:: in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/mus/disconnected_app_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_window_observer.h" 10 #include "ash/common/wm_window_observer.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 // WindowState. 50 // WindowState.
51 class WindowStateMus : public wm::WindowState { 51 class WindowStateMus : public wm::WindowState {
52 public: 52 public:
53 explicit WindowStateMus(WmWindow* window) : wm::WindowState(window) {} 53 explicit WindowStateMus(WmWindow* window) : wm::WindowState(window) {}
54 ~WindowStateMus() override {} 54 ~WindowStateMus() override {}
55 55
56 private: 56 private:
57 DISALLOW_COPY_AND_ASSIGN(WindowStateMus); 57 DISALLOW_COPY_AND_ASSIGN(WindowStateMus);
58 }; 58 };
59 59
60 ui::WindowShowState UIWindowShowStateFromMojom(::ui::mojom::ShowState state) { 60 ui::WindowShowState UIWindowShowStateFromMojom(ui::mojom::ShowState state) {
61 switch (state) { 61 switch (state) {
62 case ::ui::mojom::ShowState::DEFAULT: 62 case ui::mojom::ShowState::DEFAULT:
63 return ui::SHOW_STATE_DEFAULT; 63 return ui::SHOW_STATE_DEFAULT;
64 case ::ui::mojom::ShowState::NORMAL: 64 case ui::mojom::ShowState::NORMAL:
65 return ui::SHOW_STATE_NORMAL; 65 return ui::SHOW_STATE_NORMAL;
66 case ::ui::mojom::ShowState::MINIMIZED: 66 case ui::mojom::ShowState::MINIMIZED:
67 return ui::SHOW_STATE_MINIMIZED; 67 return ui::SHOW_STATE_MINIMIZED;
68 case ::ui::mojom::ShowState::MAXIMIZED: 68 case ui::mojom::ShowState::MAXIMIZED:
69 return ui::SHOW_STATE_MAXIMIZED; 69 return ui::SHOW_STATE_MAXIMIZED;
70 case ::ui::mojom::ShowState::INACTIVE: 70 case ui::mojom::ShowState::INACTIVE:
71 return ui::SHOW_STATE_INACTIVE; 71 return ui::SHOW_STATE_INACTIVE;
72 case ::ui::mojom::ShowState::FULLSCREEN: 72 case ui::mojom::ShowState::FULLSCREEN:
73 return ui::SHOW_STATE_FULLSCREEN; 73 return ui::SHOW_STATE_FULLSCREEN;
74 case ::ui::mojom::ShowState::DOCKED: 74 case ui::mojom::ShowState::DOCKED:
75 return ui::SHOW_STATE_DOCKED; 75 return ui::SHOW_STATE_DOCKED;
76 default: 76 default:
77 break; 77 break;
78 } 78 }
79 return ui::SHOW_STATE_DEFAULT; 79 return ui::SHOW_STATE_DEFAULT;
80 } 80 }
81 81
82 ::ui::mojom::ShowState MojomWindowShowStateFromUI(ui::WindowShowState state) { 82 ui::mojom::ShowState MojomWindowShowStateFromUI(ui::WindowShowState state) {
83 switch (state) { 83 switch (state) {
84 case ui::SHOW_STATE_DEFAULT: 84 case ui::SHOW_STATE_DEFAULT:
85 return ::ui::mojom::ShowState::DEFAULT; 85 return ui::mojom::ShowState::DEFAULT;
86 case ui::SHOW_STATE_NORMAL: 86 case ui::SHOW_STATE_NORMAL:
87 return ::ui::mojom::ShowState::NORMAL; 87 return ui::mojom::ShowState::NORMAL;
88 case ui::SHOW_STATE_MINIMIZED: 88 case ui::SHOW_STATE_MINIMIZED:
89 return ::ui::mojom::ShowState::MINIMIZED; 89 return ui::mojom::ShowState::MINIMIZED;
90 case ui::SHOW_STATE_MAXIMIZED: 90 case ui::SHOW_STATE_MAXIMIZED:
91 return ::ui::mojom::ShowState::MAXIMIZED; 91 return ui::mojom::ShowState::MAXIMIZED;
92 case ui::SHOW_STATE_INACTIVE: 92 case ui::SHOW_STATE_INACTIVE:
93 return ::ui::mojom::ShowState::INACTIVE; 93 return ui::mojom::ShowState::INACTIVE;
94 case ui::SHOW_STATE_FULLSCREEN: 94 case ui::SHOW_STATE_FULLSCREEN:
95 return ::ui::mojom::ShowState::FULLSCREEN; 95 return ui::mojom::ShowState::FULLSCREEN;
96 case ui::SHOW_STATE_DOCKED: 96 case ui::SHOW_STATE_DOCKED:
97 return ::ui::mojom::ShowState::DOCKED; 97 return ui::mojom::ShowState::DOCKED;
98 default: 98 default:
99 break; 99 break;
100 } 100 }
101 return ::ui::mojom::ShowState::DEFAULT; 101 return ui::mojom::ShowState::DEFAULT;
102 } 102 }
103 103
104 } // namespace 104 } // namespace
105 105
106 WmWindowMus::WmWindowMus(::ui::Window* window) 106 WmWindowMus::WmWindowMus(ui::Window* window)
107 : window_(window), 107 : window_(window),
108 // Matches aura, see aura::Window for details. 108 // Matches aura, see aura::Window for details.
109 observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) { 109 observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) {
110 window_->AddObserver(this); 110 window_->AddObserver(this);
111 window_->SetLocalProperty(kWmWindowKey, this); 111 window_->SetLocalProperty(kWmWindowKey, this);
112 window_state_.reset(new WindowStateMus(this)); 112 window_state_.reset(new WindowStateMus(this));
113 } 113 }
114 114
115 WmWindowMus::~WmWindowMus() { 115 WmWindowMus::~WmWindowMus() {
116 window_->RemoveObserver(this); 116 window_->RemoveObserver(this);
117 } 117 }
118 118
119 // static 119 // static
120 WmWindowMus* WmWindowMus::Get(::ui::Window* window) { 120 WmWindowMus* WmWindowMus::Get(ui::Window* window) {
121 if (!window) 121 if (!window)
122 return nullptr; 122 return nullptr;
123 123
124 WmWindowMus* wm_window = window->GetLocalProperty(kWmWindowKey); 124 WmWindowMus* wm_window = window->GetLocalProperty(kWmWindowKey);
125 if (wm_window) 125 if (wm_window)
126 return wm_window; 126 return wm_window;
127 // WmWindowMus is owned by the ui::Window. 127 // WmWindowMus is owned by the ui::Window.
128 return new WmWindowMus(window); 128 return new WmWindowMus(window);
129 } 129 }
130 130
131 // static 131 // static
132 WmWindowMus* WmWindowMus::Get(views::Widget* widget) { 132 WmWindowMus* WmWindowMus::Get(views::Widget* widget) {
133 return WmWindowMus::Get(aura::GetMusWindow(widget->GetNativeView())); 133 return WmWindowMus::Get(aura::GetMusWindow(widget->GetNativeView()));
134 } 134 }
135 135
136 // static 136 // static
137 const ::ui::Window* WmWindowMus::GetMusWindow(const WmWindow* wm_window) { 137 const ui::Window* WmWindowMus::GetMusWindow(const WmWindow* wm_window) {
138 return static_cast<const WmWindowMus*>(wm_window)->mus_window(); 138 return static_cast<const WmWindowMus*>(wm_window)->mus_window();
139 } 139 }
140 140
141 // static 141 // static
142 std::vector<WmWindow*> WmWindowMus::FromMusWindows( 142 std::vector<WmWindow*> WmWindowMus::FromMusWindows(
143 const std::vector<::ui::Window*>& mus_windows) { 143 const std::vector<ui::Window*>& mus_windows) {
144 std::vector<WmWindow*> result(mus_windows.size()); 144 std::vector<WmWindow*> result(mus_windows.size());
145 for (size_t i = 0; i < mus_windows.size(); ++i) 145 for (size_t i = 0; i < mus_windows.size(); ++i)
146 result[i] = Get(mus_windows[i]); 146 result[i] = Get(mus_windows[i]);
147 return result; 147 return result;
148 } 148 }
149 149
150 const WmRootWindowControllerMus* WmWindowMus::GetRootWindowControllerMus() 150 const WmRootWindowControllerMus* WmWindowMus::GetRootWindowControllerMus()
151 const { 151 const {
152 return WmRootWindowControllerMus::Get(window_->GetRoot()); 152 return WmRootWindowControllerMus::Get(window_->GetRoot());
153 } 153 }
(...skipping 15 matching lines...) Expand all
169 return GetRootWindowControllerMus(); 169 return GetRootWindowControllerMus();
170 } 170 }
171 171
172 WmShell* WmWindowMus::GetShell() const { 172 WmShell* WmWindowMus::GetShell() const {
173 return WmShellMus::Get(); 173 return WmShellMus::Get();
174 } 174 }
175 175
176 void WmWindowMus::SetName(const char* name) { 176 void WmWindowMus::SetName(const char* name) {
177 if (name) { 177 if (name) {
178 window_->SetSharedProperty<std::string>( 178 window_->SetSharedProperty<std::string>(
179 ::ui::mojom::WindowManager::kName_Property, std::string(name)); 179 ui::mojom::WindowManager::kName_Property, std::string(name));
180 } else { 180 } else {
181 window_->ClearSharedProperty(::ui::mojom::WindowManager::kName_Property); 181 window_->ClearSharedProperty(ui::mojom::WindowManager::kName_Property);
182 } 182 }
183 } 183 }
184 184
185 std::string WmWindowMus::GetName() const { 185 std::string WmWindowMus::GetName() const {
186 return window_->HasSharedProperty(::ui::mojom::WindowManager::kName_Property) 186 return window_->HasSharedProperty(ui::mojom::WindowManager::kName_Property)
187 ? window_->GetSharedProperty<std::string>( 187 ? window_->GetSharedProperty<std::string>(
188 ::ui::mojom::WindowManager::kName_Property) 188 ui::mojom::WindowManager::kName_Property)
189 : std::string(); 189 : std::string();
190 } 190 }
191 191
192 base::string16 WmWindowMus::GetTitle() const { 192 base::string16 WmWindowMus::GetTitle() const {
193 return GetWindowTitle(window_); 193 return GetWindowTitle(window_);
194 } 194 }
195 195
196 void WmWindowMus::SetShellWindowId(int id) { 196 void WmWindowMus::SetShellWindowId(int id) {
197 shell_window_id_ = id; 197 shell_window_id_ = id;
198 } 198 }
(...skipping 20 matching lines...) Expand all
219 bool WmWindowMus::HasNonClientArea() { 219 bool WmWindowMus::HasNonClientArea() {
220 return widget_ ? true : false; 220 return widget_ ? true : false;
221 } 221 }
222 222
223 int WmWindowMus::GetNonClientComponent(const gfx::Point& location) { 223 int WmWindowMus::GetNonClientComponent(const gfx::Point& location) {
224 return widget_ ? widget_->GetNonClientComponent(location) : HTNOWHERE; 224 return widget_ ? widget_->GetNonClientComponent(location) : HTNOWHERE;
225 } 225 }
226 226
227 gfx::Point WmWindowMus::ConvertPointToTarget(const WmWindow* target, 227 gfx::Point WmWindowMus::ConvertPointToTarget(const WmWindow* target,
228 const gfx::Point& point) const { 228 const gfx::Point& point) const {
229 const ::ui::Window* target_window = GetMusWindow(target); 229 const ui::Window* target_window = GetMusWindow(target);
230 if (target_window->Contains(window_)) { 230 if (target_window->Contains(window_)) {
231 gfx::Point result(point); 231 gfx::Point result(point);
232 const ::ui::Window* window = window_; 232 const ui::Window* window = window_;
233 while (window != target_window) { 233 while (window != target_window) {
234 result += window->bounds().origin().OffsetFromOrigin(); 234 result += window->bounds().origin().OffsetFromOrigin();
235 window = window->parent(); 235 window = window->parent();
236 } 236 }
237 return result; 237 return result;
238 } 238 }
239 if (window_->Contains(target_window)) { 239 if (window_->Contains(target_window)) {
240 gfx::Point result(point); 240 gfx::Point result(point);
241 result -= 241 result -=
242 target->ConvertPointToTarget(this, gfx::Point()).OffsetFromOrigin(); 242 target->ConvertPointToTarget(this, gfx::Point()).OffsetFromOrigin();
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 void WmWindowMus::StackChildAtTop(WmWindow* child) { 570 void WmWindowMus::StackChildAtTop(WmWindow* child) {
571 GetMusWindow(child)->MoveToFront(); 571 GetMusWindow(child)->MoveToFront();
572 } 572 }
573 573
574 void WmWindowMus::StackChildAtBottom(WmWindow* child) { 574 void WmWindowMus::StackChildAtBottom(WmWindow* child) {
575 GetMusWindow(child)->MoveToBack(); 575 GetMusWindow(child)->MoveToBack();
576 } 576 }
577 577
578 void WmWindowMus::StackChildAbove(WmWindow* child, WmWindow* target) { 578 void WmWindowMus::StackChildAbove(WmWindow* child, WmWindow* target) {
579 GetMusWindow(child)->Reorder(GetMusWindow(target), 579 GetMusWindow(child)->Reorder(GetMusWindow(target),
580 ::ui::mojom::OrderDirection::ABOVE); 580 ui::mojom::OrderDirection::ABOVE);
581 } 581 }
582 582
583 void WmWindowMus::StackChildBelow(WmWindow* child, WmWindow* target) { 583 void WmWindowMus::StackChildBelow(WmWindow* child, WmWindow* target) {
584 GetMusWindow(child)->Reorder(GetMusWindow(target), 584 GetMusWindow(child)->Reorder(GetMusWindow(target),
585 ::ui::mojom::OrderDirection::BELOW); 585 ui::mojom::OrderDirection::BELOW);
586 } 586 }
587 587
588 void WmWindowMus::SetAlwaysOnTop(bool value) { 588 void WmWindowMus::SetAlwaysOnTop(bool value) {
589 mus::SetAlwaysOnTop(window_, value); 589 mus::SetAlwaysOnTop(window_, value);
590 } 590 }
591 591
592 bool WmWindowMus::IsAlwaysOnTop() const { 592 bool WmWindowMus::IsAlwaysOnTop() const {
593 return mus::IsAlwaysOnTop(window_); 593 return mus::IsAlwaysOnTop(window_);
594 } 594 }
595 595
(...skipping 20 matching lines...) Expand all
616 window_->RequestClose(); 616 window_->RequestClose();
617 else 617 else
618 widget_->Close(); 618 widget_->Close();
619 } 619 }
620 620
621 bool WmWindowMus::IsFocused() const { 621 bool WmWindowMus::IsFocused() const {
622 return window_->HasFocus(); 622 return window_->HasFocus();
623 } 623 }
624 624
625 bool WmWindowMus::IsActive() const { 625 bool WmWindowMus::IsActive() const {
626 ::ui::Window* focused = window_->window_tree()->GetFocusedWindow(); 626 ui::Window* focused = window_->window_tree()->GetFocusedWindow();
627 return focused && window_->Contains(focused); 627 return focused && window_->Contains(focused);
628 } 628 }
629 629
630 void WmWindowMus::Activate() { 630 void WmWindowMus::Activate() {
631 window_->SetFocus(); 631 window_->SetFocus();
632 WmWindow* top_level = GetToplevelWindow(); 632 WmWindow* top_level = GetToplevelWindow();
633 if (!top_level) 633 if (!top_level)
634 return; 634 return;
635 635
636 // TODO(sky): mus should do this too. 636 // TODO(sky): mus should do this too.
637 GetMusWindow(top_level)->MoveToFront(); 637 GetMusWindow(top_level)->MoveToFront();
638 } 638 }
639 639
640 void WmWindowMus::Deactivate() { 640 void WmWindowMus::Deactivate() {
641 if (IsActive()) 641 if (IsActive())
642 window_->window_tree()->ClearFocus(); 642 window_->window_tree()->ClearFocus();
643 } 643 }
644 644
645 void WmWindowMus::SetFullscreen() { 645 void WmWindowMus::SetFullscreen() {
646 SetWindowShowState(window_, ::ui::mojom::ShowState::FULLSCREEN); 646 SetWindowShowState(window_, ui::mojom::ShowState::FULLSCREEN);
647 } 647 }
648 648
649 void WmWindowMus::Maximize() { 649 void WmWindowMus::Maximize() {
650 SetWindowShowState(window_, ::ui::mojom::ShowState::MAXIMIZED); 650 SetWindowShowState(window_, ui::mojom::ShowState::MAXIMIZED);
651 } 651 }
652 652
653 void WmWindowMus::Minimize() { 653 void WmWindowMus::Minimize() {
654 SetWindowShowState(window_, ::ui::mojom::ShowState::MINIMIZED); 654 SetWindowShowState(window_, ui::mojom::ShowState::MINIMIZED);
655 } 655 }
656 656
657 void WmWindowMus::Unminimize() { 657 void WmWindowMus::Unminimize() {
658 SetWindowShowState(window_, MojomWindowShowStateFromUI(restore_show_state_)); 658 SetWindowShowState(window_, MojomWindowShowStateFromUI(restore_show_state_));
659 restore_show_state_ = ui::SHOW_STATE_DEFAULT; 659 restore_show_state_ = ui::SHOW_STATE_DEFAULT;
660 } 660 }
661 661
662 void WmWindowMus::SetExcludedFromMru(bool excluded_from_mru) { 662 void WmWindowMus::SetExcludedFromMru(bool excluded_from_mru) {
663 NOTIMPLEMENTED(); 663 NOTIMPLEMENTED();
664 } 664 }
665 665
666 std::vector<WmWindow*> WmWindowMus::GetChildren() { 666 std::vector<WmWindow*> WmWindowMus::GetChildren() {
667 return FromMusWindows(window_->children()); 667 return FromMusWindows(window_->children());
668 } 668 }
669 669
670 WmWindow* WmWindowMus::GetChildByShellWindowId(int id) { 670 WmWindow* WmWindowMus::GetChildByShellWindowId(int id) {
671 if (id == shell_window_id_) 671 if (id == shell_window_id_)
672 return this; 672 return this;
673 for (::ui::Window* child : window_->children()) { 673 for (ui::Window* child : window_->children()) {
674 WmWindow* result = Get(child)->GetChildByShellWindowId(id); 674 WmWindow* result = Get(child)->GetChildByShellWindowId(id);
675 if (result) 675 if (result)
676 return result; 676 return result;
677 } 677 }
678 return nullptr; 678 return nullptr;
679 } 679 }
680 680
681 void WmWindowMus::ShowResizeShadow(int component) { 681 void WmWindowMus::ShowResizeShadow(int component) {
682 NOTIMPLEMENTED(); 682 NOTIMPLEMENTED();
683 } 683 }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 760
761 void WmWindowMus::OnTreeChanged(const TreeChangeParams& params) { 761 void WmWindowMus::OnTreeChanged(const TreeChangeParams& params) {
762 WmWindowObserver::TreeChangeParams wm_params; 762 WmWindowObserver::TreeChangeParams wm_params;
763 wm_params.target = Get(params.target); 763 wm_params.target = Get(params.target);
764 wm_params.new_parent = Get(params.new_parent); 764 wm_params.new_parent = Get(params.new_parent);
765 wm_params.old_parent = Get(params.old_parent); 765 wm_params.old_parent = Get(params.old_parent);
766 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 766 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
767 OnWindowTreeChanged(this, wm_params)); 767 OnWindowTreeChanged(this, wm_params));
768 } 768 }
769 769
770 void WmWindowMus::OnWindowReordered(::ui::Window* window, 770 void WmWindowMus::OnWindowReordered(ui::Window* window,
771 ::ui::Window* relative_window, 771 ui::Window* relative_window,
772 ::ui::mojom::OrderDirection direction) { 772 ui::mojom::OrderDirection direction) {
773 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 773 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
774 OnWindowStackingChanged(this)); 774 OnWindowStackingChanged(this));
775 } 775 }
776 776
777 void WmWindowMus::OnWindowSharedPropertyChanged( 777 void WmWindowMus::OnWindowSharedPropertyChanged(
778 ::ui::Window* window, 778 ui::Window* window,
779 const std::string& name, 779 const std::string& name,
780 const std::vector<uint8_t>* old_data, 780 const std::vector<uint8_t>* old_data,
781 const std::vector<uint8_t>* new_data) { 781 const std::vector<uint8_t>* new_data) {
782 if (name == ::ui::mojom::WindowManager::kShowState_Property) { 782 if (name == ui::mojom::WindowManager::kShowState_Property) {
783 GetWindowState()->OnWindowShowStateChanged(); 783 GetWindowState()->OnWindowShowStateChanged();
784 return; 784 return;
785 } 785 }
786 if (name == ::ui::mojom::WindowManager::kAlwaysOnTop_Property) { 786 if (name == ui::mojom::WindowManager::kAlwaysOnTop_Property) {
787 FOR_EACH_OBSERVER( 787 FOR_EACH_OBSERVER(
788 WmWindowObserver, observers_, 788 WmWindowObserver, observers_,
789 OnWindowPropertyChanged(this, WmWindowProperty::ALWAYS_ON_TOP)); 789 OnWindowPropertyChanged(this, WmWindowProperty::ALWAYS_ON_TOP));
790 return; 790 return;
791 } 791 }
792 792
793 // Deal with snap to pixel. 793 // Deal with snap to pixel.
794 NOTIMPLEMENTED(); 794 NOTIMPLEMENTED();
795 } 795 }
796 796
797 void WmWindowMus::OnWindowBoundsChanged(::ui::Window* window, 797 void WmWindowMus::OnWindowBoundsChanged(ui::Window* window,
798 const gfx::Rect& old_bounds, 798 const gfx::Rect& old_bounds,
799 const gfx::Rect& new_bounds) { 799 const gfx::Rect& new_bounds) {
800 FOR_EACH_OBSERVER(WmWindowObserver, observers_, 800 FOR_EACH_OBSERVER(WmWindowObserver, observers_,
801 OnWindowBoundsChanged(this, old_bounds, new_bounds)); 801 OnWindowBoundsChanged(this, old_bounds, new_bounds));
802 } 802 }
803 803
804 void WmWindowMus::OnWindowDestroying(::ui::Window* window) { 804 void WmWindowMus::OnWindowDestroying(ui::Window* window) {
805 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this)); 805 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this));
806 } 806 }
807 807
808 void WmWindowMus::OnWindowDestroyed(::ui::Window* window) { 808 void WmWindowMus::OnWindowDestroyed(ui::Window* window) {
809 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this)); 809 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroyed(this));
810 } 810 }
811 811
812 } // namespace mus 812 } // namespace mus
813 } // namespace ash 813 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/bridge/wm_window_mus.h ('k') | ash/mus/disconnected_app_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698