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/common/wm_window.h" | 5 #include "ash/common/wm_window.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 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
461 const gfx::Rect& WmWindow::GetBounds() const { | 461 const gfx::Rect& WmWindow::GetBounds() const { |
462 return window_->bounds(); | 462 return window_->bounds(); |
463 } | 463 } |
464 | 464 |
465 gfx::Rect WmWindow::GetTargetBounds() { | 465 gfx::Rect WmWindow::GetTargetBounds() { |
466 return window_->GetTargetBounds(); | 466 return window_->GetTargetBounds(); |
467 } | 467 } |
468 | 468 |
469 void WmWindow::ClearRestoreBounds() { | 469 void WmWindow::ClearRestoreBounds() { |
470 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 470 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 471 window_->ClearProperty(aura::client::kVirtualKeyboardRestoreBoundsKey); |
471 } | 472 } |
472 | 473 |
473 void WmWindow::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 474 void WmWindow::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
474 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 475 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
475 } | 476 } |
476 | 477 |
477 gfx::Rect WmWindow::GetRestoreBoundsInScreen() const { | 478 gfx::Rect WmWindow::GetRestoreBoundsInScreen() const { |
478 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 479 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
479 return bounds ? *bounds : gfx::Rect(); | 480 return bounds ? *bounds : gfx::Rect(); |
480 } | 481 } |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
796 observer.OnTransientChildAdded(this, Get(transient)); | 797 observer.OnTransientChildAdded(this, Get(transient)); |
797 } | 798 } |
798 | 799 |
799 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 800 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
800 aura::Window* transient) { | 801 aura::Window* transient) { |
801 for (auto& observer : transient_observers_) | 802 for (auto& observer : transient_observers_) |
802 observer.OnTransientChildRemoved(this, Get(transient)); | 803 observer.OnTransientChildRemoved(this, Get(transient)); |
803 } | 804 } |
804 | 805 |
805 } // namespace ash | 806 } // namespace ash |
OLD | NEW |