Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_util.h" | 5 #include "ash/wm/window_util.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/wm/window_positioning_utils.h" | 8 #include "ash/common/wm/window_positioning_utils.h" |
| 9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/common/wm_window.h" | |
| 11 #include "ash/common/wm_window_property.h" | |
| 10 #include "ash/screen_util.h" | 12 #include "ash/screen_util.h" |
| 11 #include "ash/test/ash_test_base.h" | 13 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/wm/window_state_aura.h" | 14 #include "ash/wm/window_state_aura.h" |
| 15 #include "ui/aura/client/aura_constants.h" | |
| 13 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
| 14 | 17 |
| 15 namespace ash { | 18 namespace ash { |
| 16 | 19 |
| 17 namespace { | 20 namespace { |
| 18 | 21 |
| 19 std::string GetAdjustedBounds(const gfx::Rect& visible, | 22 std::string GetAdjustedBounds(const gfx::Rect& visible, |
| 20 gfx::Rect to_be_adjusted) { | 23 gfx::Rect to_be_adjusted) { |
| 21 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted); | 24 wm::AdjustBoundsToEnsureMinimumWindowVisibility(visible, &to_be_adjusted); |
| 22 return to_be_adjusted.ToString(); | 25 return to_be_adjusted.ToString(); |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 EXPECT_EQ( | 88 EXPECT_EQ( |
| 86 "-250,-40 100x100", | 89 "-250,-40 100x100", |
| 87 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); | 90 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-250, -40, 150, 150))); |
| 88 EXPECT_EQ( | 91 EXPECT_EQ( |
| 89 "-275,-50 100x100", | 92 "-275,-50 100x100", |
| 90 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); | 93 GetAdjustedBounds(visible_bounds_left, gfx::Rect(-400, -60, 150, 150))); |
| 91 EXPECT_EQ("-125,0 100x100", | 94 EXPECT_EQ("-125,0 100x100", |
| 92 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); | 95 GetAdjustedBounds(visible_bounds_left, gfx::Rect(0, 0, 150, 150))); |
| 93 } | 96 } |
| 94 | 97 |
| 98 // Test that WmWindow can get a Rect property set by aura::Window | |
| 99 TEST_F(WindowUtilTest, RectPropertyTest) { | |
| 100 UpdateDisplay("500x400, 600x400"); | |
|
oshima
2016/08/16 23:14:02
This will not work on windows. Do you need this?
hariank
2016/08/16 23:35:06
Done.
| |
| 101 std::unique_ptr<aura::Window> window( | |
| 102 CreateTestWindowInShellWithBounds(gfx::Rect())); | |
| 103 | |
| 104 gfx::Rect* prop_rect = new gfx::Rect(0, 0, 100, 100); | |
| 105 window->SetProperty(aura::client::kVKNewBoundsKey, prop_rect); | |
| 106 | |
| 107 WmWindow* wm_window = WmWindowAura::Get(window.get()); | |
| 108 EXPECT_EQ(wm_window->GetRectProperty(WmWindowProperty::VK_NEW_BOUNDS), | |
| 109 prop_rect); | |
| 110 | |
| 111 window->ClearProperty(aura::client::kVKNewBoundsKey); | |
| 112 EXPECT_EQ(wm_window->GetRectProperty(WmWindowProperty::VK_NEW_BOUNDS), | |
| 113 nullptr); | |
| 114 } | |
| 115 | |
| 95 } // namespace ash | 116 } // namespace ash |
| OLD | NEW |