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_shell_aura.h" | 8 #include "ash/aura/wm_shell_aura.h" |
9 #include "ash/common/ash_constants.h" | 9 #include "ash/common/ash_constants.h" |
10 #include "ash/common/shelf/shelf_item_types.h" | 10 #include "ash/common/shelf/shelf_item_types.h" |
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 const gfx::Rect& WmWindowAura::GetBounds() const { | 576 const gfx::Rect& WmWindowAura::GetBounds() const { |
577 return window_->bounds(); | 577 return window_->bounds(); |
578 } | 578 } |
579 | 579 |
580 gfx::Rect WmWindowAura::GetTargetBounds() { | 580 gfx::Rect WmWindowAura::GetTargetBounds() { |
581 return window_->GetTargetBounds(); | 581 return window_->GetTargetBounds(); |
582 } | 582 } |
583 | 583 |
584 void WmWindowAura::ClearRestoreBounds() { | 584 void WmWindowAura::ClearRestoreBounds() { |
585 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 585 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 586 window_->ClearProperty(aura::client::kVirtualKeyboardRestoreBoundsKey); |
586 } | 587 } |
587 | 588 |
588 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 589 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
589 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 590 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
590 } | 591 } |
591 | 592 |
592 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { | 593 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { |
593 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 594 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
594 return bounds ? *bounds : gfx::Rect(); | 595 return bounds ? *bounds : gfx::Rect(); |
595 } | 596 } |
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
991 observer.OnTransientChildAdded(this, Get(transient)); | 992 observer.OnTransientChildAdded(this, Get(transient)); |
992 } | 993 } |
993 | 994 |
994 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, | 995 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, |
995 aura::Window* transient) { | 996 aura::Window* transient) { |
996 for (auto& observer : transient_observers_) | 997 for (auto& observer : transient_observers_) |
997 observer.OnTransientChildRemoved(this, Get(transient)); | 998 observer.OnTransientChildRemoved(this, Get(transient)); |
998 } | 999 } |
999 | 1000 |
1000 } // namespace ash | 1001 } // namespace ash |
OLD | NEW |