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 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 const gfx::Rect& WmWindowAura::GetBounds() const { | 567 const gfx::Rect& WmWindowAura::GetBounds() const { |
568 return window_->bounds(); | 568 return window_->bounds(); |
569 } | 569 } |
570 | 570 |
571 gfx::Rect WmWindowAura::GetTargetBounds() { | 571 gfx::Rect WmWindowAura::GetTargetBounds() { |
572 return window_->GetTargetBounds(); | 572 return window_->GetTargetBounds(); |
573 } | 573 } |
574 | 574 |
575 void WmWindowAura::ClearRestoreBounds() { | 575 void WmWindowAura::ClearRestoreBounds() { |
576 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 576 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 577 window_->ClearProperty(aura::client::kVirtualKeyboardRestoreBoundsKey); |
577 } | 578 } |
578 | 579 |
579 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 580 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
580 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 581 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
581 } | 582 } |
582 | 583 |
583 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { | 584 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { |
584 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 585 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
585 return bounds ? *bounds : gfx::Rect(); | 586 return bounds ? *bounds : gfx::Rect(); |
586 } | 587 } |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
962 observer.OnTransientChildAdded(this, Get(transient)); | 963 observer.OnTransientChildAdded(this, Get(transient)); |
963 } | 964 } |
964 | 965 |
965 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, | 966 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, |
966 aura::Window* transient) { | 967 aura::Window* transient) { |
967 for (auto& observer : transient_observers_) | 968 for (auto& observer : transient_observers_) |
968 observer.OnTransientChildRemoved(this, Get(transient)); | 969 observer.OnTransientChildRemoved(this, Get(transient)); |
969 } | 970 } |
970 | 971 |
971 } // namespace ash | 972 } // namespace ash |
OLD | NEW |