| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 NOTIMPLEMENTED(); | 373 NOTIMPLEMENTED(); |
| 374 return 0; | 374 return 0; |
| 375 } | 375 } |
| 376 | 376 |
| 377 if (key == WmWindowProperty::TOP_VIEW_INSET) { | 377 if (key == WmWindowProperty::TOP_VIEW_INSET) { |
| 378 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. | 378 // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100. |
| 379 NOTIMPLEMENTED(); | 379 NOTIMPLEMENTED(); |
| 380 return 0; | 380 return 0; |
| 381 } | 381 } |
| 382 | 382 |
| 383 if (key == WmWindowProperty::MODAL_TYPE) { |
| 384 // TODO: WindowTree::SetModalWindow() needs to route through WindowManager |
| 385 // so wm can position. http://crbug.com/645996. |
| 386 NOTIMPLEMENTED(); |
| 387 return static_cast<int>(ui::MODAL_TYPE_NONE); |
| 388 } |
| 389 |
| 383 NOTREACHED(); | 390 NOTREACHED(); |
| 384 return 0; | 391 return 0; |
| 385 } | 392 } |
| 386 | 393 |
| 387 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) { | 394 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) { |
| 388 if (key == WmWindowProperty::SHELF_ID) { | 395 if (key == WmWindowProperty::SHELF_ID) { |
| 389 NOTIMPLEMENTED(); | 396 NOTIMPLEMENTED(); |
| 390 return; | 397 return; |
| 391 } | 398 } |
| 392 | 399 |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 911 } | 918 } |
| 912 | 919 |
| 913 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, | 920 void WmWindowMus::OnTransientChildRemoved(ui::Window* window, |
| 914 ui::Window* transient) { | 921 ui::Window* transient) { |
| 915 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, | 922 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, |
| 916 OnTransientChildRemoved(this, Get(transient))); | 923 OnTransientChildRemoved(this, Get(transient))); |
| 917 } | 924 } |
| 918 | 925 |
| 919 } // namespace mus | 926 } // namespace mus |
| 920 } // namespace ash | 927 } // namespace ash |
| OLD | NEW |