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 548 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 const gfx::Rect& WmWindowAura::GetBounds() const { | 559 const gfx::Rect& WmWindowAura::GetBounds() const { |
560 return window_->bounds(); | 560 return window_->bounds(); |
561 } | 561 } |
562 | 562 |
563 gfx::Rect WmWindowAura::GetTargetBounds() { | 563 gfx::Rect WmWindowAura::GetTargetBounds() { |
564 return window_->GetTargetBounds(); | 564 return window_->GetTargetBounds(); |
565 } | 565 } |
566 | 566 |
567 void WmWindowAura::ClearRestoreBounds() { | 567 void WmWindowAura::ClearRestoreBounds() { |
568 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 568 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 569 window_->ClearProperty(aura::client::kVirtualKeyboardRestoreBoundsKey); |
569 } | 570 } |
570 | 571 |
571 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 572 void WmWindowAura::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
572 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 573 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
573 } | 574 } |
574 | 575 |
575 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { | 576 gfx::Rect WmWindowAura::GetRestoreBoundsInScreen() const { |
576 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 577 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
577 return bounds ? *bounds : gfx::Rect(); | 578 return bounds ? *bounds : gfx::Rect(); |
578 } | 579 } |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
939 observer.OnTransientChildAdded(this, Get(transient)); | 940 observer.OnTransientChildAdded(this, Get(transient)); |
940 } | 941 } |
941 | 942 |
942 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, | 943 void WmWindowAura::OnTransientChildRemoved(aura::Window* window, |
943 aura::Window* transient) { | 944 aura::Window* transient) { |
944 for (auto& observer : transient_observers_) | 945 for (auto& observer : transient_observers_) |
945 observer.OnTransientChildRemoved(this, Get(transient)); | 946 observer.OnTransientChildRemoved(this, Get(transient)); |
946 } | 947 } |
947 | 948 |
948 } // namespace ash | 949 } // namespace ash |
OLD | NEW |