| 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 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 346 NOTIMPLEMENTED(); | 346 NOTIMPLEMENTED(); |
| 347 return 0; | 347 return 0; |
| 348 } | 348 } |
| 349 | 349 |
| 350 if (key == WmWindowProperty::TOP_VIEW_INSET) { | 350 if (key == WmWindowProperty::TOP_VIEW_INSET) { |
| 351 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. | 351 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. |
| 352 NOTIMPLEMENTED(); | 352 NOTIMPLEMENTED(); |
| 353 return 0; | 353 return 0; |
| 354 } | 354 } |
| 355 | 355 |
| 356 if (key == WmWindowProperty::MODAL_TYPE) { |
| 357 // TODO: WindowTree::SetModalWindow() needs to route through WindowManager |
| 358 // so wm can position. http://crbug.com/645996. |
| 359 NOTIMPLEMENTED(); |
| 360 return static_cast<int>(ui::MODAL_TYPE_NONE); |
| 361 } |
| 362 |
| 356 NOTREACHED(); | 363 NOTREACHED(); |
| 357 return 0; | 364 return 0; |
| 358 } | 365 } |
| 359 | 366 |
| 360 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) { | 367 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) { |
| 361 if (key == WmWindowProperty::SHELF_ID) { | 368 if (key == WmWindowProperty::SHELF_ID) { |
| 362 NOTIMPLEMENTED(); | 369 NOTIMPLEMENTED(); |
| 363 return; | 370 return; |
| 364 } | 371 } |
| 365 | 372 |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 884 } | 891 } |
| 885 | 892 |
| 886 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, | 893 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, |
| 887 ui::Window* transient) { | 894 ui::Window* transient) { |
| 888 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, | 895 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, |
| 889 OnTransientChildRemoved(this, Get(transient))); | 896 OnTransientChildRemoved(this, Get(transient))); |
| 890 } | 897 } |
| 891 | 898 |
| 892 } // namespace mus | 899 } // namespace mus |
| 893 } // namespace ash | 900 } // namespace ash |
| OLD | NEW |