Map fullscreen button to maximize

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 432 matching lines @@
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_right.ToString());
 
     // It should cycle back to the first snapped position.
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_EQ(window->bounds().ToString(), snap_right.ToString());
   }
   {
     gfx::Rect normal_bounds = window->bounds();
 
-    GetController()->PerformAction(WINDOW_MAXIMIZE_RESTORE, dummy);
+    GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
     EXPECT_NE(normal_bounds.ToString(), window->bounds().ToString());
 
-    GetController()->PerformAction(WINDOW_MAXIMIZE_RESTORE, dummy);
+    GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
     EXPECT_EQ(normal_bounds.ToString(), window->bounds().ToString());
 
-    GetController()->PerformAction(WINDOW_MAXIMIZE_RESTORE, dummy);
+    GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
 
-    GetController()->PerformAction(WINDOW_MAXIMIZE_RESTORE, dummy);
+    GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     GetController()->PerformAction(WINDOW_SNAP_RIGHT, dummy);
     EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
 
-    GetController()->PerformAction(WINDOW_MAXIMIZE_RESTORE, dummy);
+    GetController()->PerformAction(TOGGLE_MAXIMIZED, dummy);
     EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     EXPECT_FALSE(wm::IsWindowMaximized(window.get()));
     EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
     wm::RestoreWindow(window.get());
     wm::ActivateWindow(window.get());
   }
   {
     GetController()->PerformAction(WINDOW_MINIMIZE, dummy);
     EXPECT_TRUE(wm::IsWindowMinimized(window.get()));
@@ skipping 528 matching lines @@
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_PRINT, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_NONE)));
   EXPECT_FALSE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_A, ui::EF_NONE)));
 }
 
 }  // namespace test
 }  // namespace ash