Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 2897993003: chromeos: converts WindowResizer to aura::Window (Closed)
Patch Set: remove include from exo Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_size_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index fee188a402ca8a404555d00a4a814084bf01bff9..e9de06f61e32e426727d11743565484a787d9c83 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -433,14 +433,14 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
{
GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_LEFT);
- gfx::Rect expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(
- WmWindow::Get(window.get()));
+ gfx::Rect expected_bounds =
+ wm::GetDefaultLeftSnappedWindowBoundsInParent(window.get());
EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
}
{
GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_RIGHT);
- gfx::Rect expected_bounds = wm::GetDefaultRightSnappedWindowBoundsInParent(
- WmWindow::Get(window.get()));
+ gfx::Rect expected_bounds =
+ wm::GetDefaultRightSnappedWindowBoundsInParent(window.get());
EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
}
{
@@ -489,8 +489,8 @@ TEST_F(AcceleratorControllerTest, TestRepeatedSnap) {
// Snap right.
GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_RIGHT);
gfx::Rect normal_bounds = window_state->GetRestoreBoundsInParent();
- gfx::Rect expected_bounds = wm::GetDefaultRightSnappedWindowBoundsInParent(
- WmWindow::Get(window.get()));
+ gfx::Rect expected_bounds =
+ wm::GetDefaultRightSnappedWindowBoundsInParent(window.get());
EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
EXPECT_TRUE(window_state->IsSnapped());
// Snap right again ->> becomes normal.
@@ -503,8 +503,7 @@ TEST_F(AcceleratorControllerTest, TestRepeatedSnap) {
// Snap left.
GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_LEFT);
EXPECT_TRUE(window_state->IsSnapped());
- expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(
- WmWindow::Get(window.get()));
+ expected_bounds = wm::GetDefaultLeftSnappedWindowBoundsInParent(window.get());
EXPECT_EQ(expected_bounds.ToString(), window->bounds().ToString());
// Snap left again ->> becomes normal.
GetController()->PerformActionIfEnabled(WINDOW_CYCLE_SNAP_LEFT);
« no previous file with comments | « no previous file | ash/frame/caption_buttons/frame_size_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698