| 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/aura/wm_window_aura.h" | 5 #include "ash/aura/wm_window_aura.h" |
| 6 | 6 |
| 7 #include "ash/aura/aura_layout_manager_adapter.h" | 7 #include "ash/aura/aura_layout_manager_adapter.h" |
| 8 #include "ash/aura/wm_root_window_controller_aura.h" | 8 #include "ash/aura/wm_root_window_controller_aura.h" |
| 9 #include "ash/aura/wm_shell_aura.h" | 9 #include "ash/aura/wm_shell_aura.h" |
| 10 #include "ash/common/ash_constants.h" | 10 #include "ash/common/ash_constants.h" |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 const gfx::Rect& WmWindowAura::GetBounds() const { | 467 const gfx::Rect& WmWindowAura::GetBounds() const { |
| 468 return window_->bounds(); | 468 return window_->bounds(); |
| 469 } | 469 } |
| 470 | 470 |
| 471 gfx::Rect WmWindowAura::GetTargetBounds() { | 471 gfx::Rect WmWindowAura::GetTargetBounds() { |
| 472 return window_->GetTargetBounds(); | 472 return window_->GetTargetBounds(); |
| 473 } | 473 } |
| 474 | 474 |
| 475 void WmWindowAura::ClearRestoreBounds() { | 475 void WmWindowAura::ClearRestoreBounds() { |
| 476 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 476 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 477 window_->ClearProperty(aura::client::kVirtualKeyboardRestoreBoundsKey); |
| 477 } | 478 } |
| 478 | 479 |
| 479 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 480 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
| 480 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 481 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
| 481 } | 482 } |
| 482 | 483 |
| 483 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { | 484 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { |
| 484 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 485 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
| 485 return bounds ? *bounds : gfx::Rect(); | 486 return bounds ? *bounds : gfx::Rect(); |
| 486 } | 487 } |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 OnTransientChildAdded(this, Get(transient))); | 825 OnTransientChildAdded(this, Get(transient))); |
| 825 } | 826 } |
| 826 | 827 |
| 827 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, | 828 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, |
| 828 aura::Window* transient) { | 829 aura::Window* transient) { |
| 829 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, | 830 FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_, |
| 830 OnTransientChildRemoved(this, Get(transient))); | 831 OnTransientChildRemoved(this, Get(transient))); |
| 831 } | 832 } |
| 832 | 833 |
| 833 } // namespace ash | 834 } // namespace ash |
| OLD | NEW |