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/wm_window.h" | 5 #include "ash/wm_window.h" |
6 | 6 |
7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
8 #include "ash/aura/aura_layout_manager_adapter.h" | 8 #include "ash/aura/aura_layout_manager_adapter.h" |
9 #include "ash/public/cpp/config.h" | 9 #include "ash/public/cpp/config.h" |
10 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 #include "ui/base/class_property.h" | 37 #include "ui/base/class_property.h" |
38 #include "ui/base/hit_test.h" | 38 #include "ui/base/hit_test.h" |
39 #include "ui/compositor/layer_tree_owner.h" | 39 #include "ui/compositor/layer_tree_owner.h" |
40 #include "ui/compositor/scoped_layer_animation_settings.h" | 40 #include "ui/compositor/scoped_layer_animation_settings.h" |
41 #include "ui/display/screen.h" | 41 #include "ui/display/screen.h" |
42 #include "ui/gfx/geometry/insets.h" | 42 #include "ui/gfx/geometry/insets.h" |
43 #include "ui/views/widget/widget.h" | 43 #include "ui/views/widget/widget.h" |
44 #include "ui/views/widget/widget_delegate.h" | 44 #include "ui/views/widget/widget_delegate.h" |
45 #include "ui/wm/core/coordinate_conversion.h" | 45 #include "ui/wm/core/coordinate_conversion.h" |
46 #include "ui/wm/core/easy_resize_window_targeter.h" | 46 #include "ui/wm/core/easy_resize_window_targeter.h" |
| 47 #include "ui/wm/core/ime_util_chromeos.h" |
47 #include "ui/wm/core/transient_window_manager.h" | 48 #include "ui/wm/core/transient_window_manager.h" |
48 #include "ui/wm/core/visibility_controller.h" | 49 #include "ui/wm/core/visibility_controller.h" |
49 #include "ui/wm/core/window_util.h" | 50 #include "ui/wm/core/window_util.h" |
50 | 51 |
51 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::WmWindow*); | 52 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::WmWindow*); |
52 | 53 |
53 namespace ash { | 54 namespace ash { |
54 | 55 |
55 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); | 56 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(WmWindow, kWmWindowKey, nullptr); |
56 | 57 |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
432 const gfx::Rect& WmWindow::GetBounds() const { | 433 const gfx::Rect& WmWindow::GetBounds() const { |
433 return window_->bounds(); | 434 return window_->bounds(); |
434 } | 435 } |
435 | 436 |
436 gfx::Rect WmWindow::GetTargetBounds() { | 437 gfx::Rect WmWindow::GetTargetBounds() { |
437 return window_->GetTargetBounds(); | 438 return window_->GetTargetBounds(); |
438 } | 439 } |
439 | 440 |
440 void WmWindow::ClearRestoreBounds() { | 441 void WmWindow::ClearRestoreBounds() { |
441 window_->ClearProperty(aura::client::kRestoreBoundsKey); | 442 window_->ClearProperty(aura::client::kRestoreBoundsKey); |
| 443 window_->ClearProperty(::wm::kVirtualKeyboardRestoreBoundsKey); |
442 } | 444 } |
443 | 445 |
444 void WmWindow::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { | 446 void WmWindow::SetRestoreBoundsInScreen(const gfx::Rect& bounds) { |
445 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); | 447 window_->SetProperty(aura::client::kRestoreBoundsKey, new gfx::Rect(bounds)); |
446 } | 448 } |
447 | 449 |
448 gfx::Rect WmWindow::GetRestoreBoundsInScreen() const { | 450 gfx::Rect WmWindow::GetRestoreBoundsInScreen() const { |
449 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); | 451 gfx::Rect* bounds = window_->GetProperty(aura::client::kRestoreBoundsKey); |
450 return bounds ? *bounds : gfx::Rect(); | 452 return bounds ? *bounds : gfx::Rect(); |
451 } | 453 } |
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
755 observer.OnTransientChildAdded(this, Get(transient)); | 757 observer.OnTransientChildAdded(this, Get(transient)); |
756 } | 758 } |
757 | 759 |
758 void WmWindow::OnTransientChildRemoved(aura::Window* window, | 760 void WmWindow::OnTransientChildRemoved(aura::Window* window, |
759 aura::Window* transient) { | 761 aura::Window* transient) { |
760 for (auto& observer : transient_observers_) | 762 for (auto& observer : transient_observers_) |
761 observer.OnTransientChildRemoved(this, Get(transient)); | 763 observer.OnTransientChildRemoved(this, Get(transient)); |
762 } | 764 } |
763 | 765 |
764 } // namespace ash | 766 } // namespace ash |
OLD | NEW |