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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix AcceleratorControllerTest.WindowSnap Created 8 years, 2 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 | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('J')
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 fca81ff9cb343ddf3b3873c2253094dbfe056688..f8a3b3d2dcd0788970019171599d2a4537a44c0b 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -450,33 +450,20 @@ TEST_F(AcceleratorControllerTest, WindowSnap) {
{
gfx::Rect normal_bounds = window->bounds();
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
- EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
- EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString());
-
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
- EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
- EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString());
-
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
+ ash::wm::MaximizeWindow(window.get());
+ EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
+ ash::wm::MaximizeWindow(window.get());
+ EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_PRESSED, dummy);
- GetController()->PerformAction(TOGGLE_MAXIMIZED_RELEASED, dummy);
+ ash::wm::MaximizeWindow(window.get());
EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698