Chromium Code Reviews| 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/wm/aura/wm_window_aura.h" | 5 #include "ash/wm/aura/wm_window_aura.h" |
| 6 | 6 |
| 7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
| 8 #include "ash/shelf/shelf_util.h" | 8 #include "ash/shelf/shelf_util.h" |
| 9 #include "ash/wm/aura/aura_layout_manager_adapter.h" | 9 #include "ash/wm/aura/aura_layout_manager_adapter.h" |
| 10 #include "ash/wm/aura/wm_globals_aura.h" | 10 #include "ash/wm/aura/wm_globals_aura.h" |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 525 | 525 |
| 526 void WmWindowAura::OnWindowPropertyChanged(aura::Window* window, | 526 void WmWindowAura::OnWindowPropertyChanged(aura::Window* window, |
| 527 const void* key, | 527 const void* key, |
| 528 intptr_t old) { | 528 intptr_t old) { |
| 529 if (key == aura::client::kShowStateKey) { | 529 if (key == aura::client::kShowStateKey) { |
| 530 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); | 530 ash::wm::GetWindowState(window_)->OnWindowShowStateChanged(); |
| 531 return; | 531 return; |
| 532 } | 532 } |
| 533 WmWindowProperty wm_property; | 533 WmWindowProperty wm_property; |
| 534 if (key == kSnapChildrenToPixelBoundary) { | 534 if (key == kSnapChildrenToPixelBoundary) { |
| 535 wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUDARY; | 535 wm_property = WmWindowProperty::SNAP_CHILDREN_TO_PIXEL_BOUDARY; |
|
James Cook
2016/05/19 23:08:23
not for this CL, but at some point BOUDARY -> BOUN
| |
| 536 } else if (key == aura::client::kAlwaysOnTopKey) { | 536 } else if (key == aura::client::kAlwaysOnTopKey) { |
| 537 wm_property = WmWindowProperty::ALWAYS_ON_TOP; | 537 wm_property = WmWindowProperty::ALWAYS_ON_TOP; |
| 538 } else if (key == kShelfID) { | 538 } else if (key == kShelfID) { |
| 539 wm_property = WmWindowProperty::SHELF_ID; | 539 wm_property = WmWindowProperty::SHELF_ID; |
| 540 } else { | 540 } else { |
| 541 return; | 541 return; |
| 542 } | 542 } |
| 543 FOR_EACH_OBSERVER(WmWindowObserver, observers_, | 543 FOR_EACH_OBSERVER(WmWindowObserver, observers_, |
| 544 OnWindowPropertyChanged(this, wm_property, old)); | 544 OnWindowPropertyChanged(this, wm_property)); |
| 545 } | 545 } |
| 546 | 546 |
| 547 void WmWindowAura::OnWindowBoundsChanged(aura::Window* window, | 547 void WmWindowAura::OnWindowBoundsChanged(aura::Window* window, |
| 548 const gfx::Rect& old_bounds, | 548 const gfx::Rect& old_bounds, |
| 549 const gfx::Rect& new_bounds) { | 549 const gfx::Rect& new_bounds) { |
| 550 FOR_EACH_OBSERVER(WmWindowObserver, observers_, | 550 FOR_EACH_OBSERVER(WmWindowObserver, observers_, |
| 551 OnWindowBoundsChanged(this, old_bounds, new_bounds)); | 551 OnWindowBoundsChanged(this, old_bounds, new_bounds)); |
| 552 } | 552 } |
| 553 | 553 |
| 554 void WmWindowAura::OnWindowDestroying(aura::Window* window) { | 554 void WmWindowAura::OnWindowDestroying(aura::Window* window) { |
| 555 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this)); | 555 FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowDestroying(this)); |
| 556 } | 556 } |
| 557 | 557 |
| 558 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window, | 558 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window, |
| 559 bool visible) { | 559 bool visible) { |
| 560 FOR_EACH_OBSERVER(WmWindowObserver, observers_, | 560 FOR_EACH_OBSERVER(WmWindowObserver, observers_, |
| 561 OnWindowVisibilityChanging(this, visible)); | 561 OnWindowVisibilityChanging(this, visible)); |
| 562 } | 562 } |
| 563 | 563 |
| 564 } // namespace wm | 564 } // namespace wm |
| 565 } // namespace ash | 565 } // namespace ash |
| OLD | NEW |