Map fullscreen button to maximize

ash/accelerators/accelerator_controller.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 <algorithm>
 #include <cmath>
 #include <string>
 
@@ skipping 631 matching lines @@
         return HandleCycleWindowMRU(WindowCycleController::FORWARD, false);
       // Disable the shortcut for minimizing full screen window due to
       // crbug.com/131709, which is a crashing issue related to minimizing
       // full screen pepper window.
       if (!wm::IsWindowFullscreen(window)) {
         wm::MinimizeWindow(window);
         return true;
       }
       break;
     }
-    case WINDOW_MAXIMIZE_RESTORE: {
+    case TOGGLE_MAXIMIZED: {
+      if (key_code == ui::VKEY_F4 && shell->delegate()) {
+        shell->delegate()->RecordUserMetricsAction(
+            UMA_ACCEL_MAXIMIZE_RESTORE_F4);
+      }
       aura::Window* window = wm::GetActiveWindow();
-      // Attempt to restore the window that would be cycled through next from
-      // the launcher when there is no active window.
       if (!window)
-        return HandleCycleWindowMRU(WindowCycleController::FORWARD, false);
-      if (!wm::IsWindowFullscreen(window)) {
-        if (wm::IsWindowMaximized(window))
-          wm::RestoreWindow(window);
-        else
-          wm::MaximizeWindow(window);
         return true;
+      if (wm::IsWindowFullscreen(window)) {
+        // Chrome also uses VKEY_F4 as a shortcut. Its action is to toggle
+        // fullscreen. If we got here via VKEY_F4, chrome's action will

[sky, 2012/09/16 16:08:03]

Change that last sentence to 'Return false so Chrome processes F4 and exits
fullscreen.

[sschmitz, 2012/09/17 15:22:05]

Done.

+        // execute next and fullscreen will be toggled off.
+        return false;
       }
-      break;
+      if (wm::IsWindowMaximized(window))
+        wm::RestoreWindow(window);
+      else if (wm::CanMaximizeWindow(window))
+        wm::MaximizeWindow(window);
+      return true;
     }
     case WINDOW_POSITION_CENTER: {
       aura::Window* window = wm::GetActiveWindow();
       if (window) {
         wm::CenterWindow(window);
         return true;
       }
       break;
     }
     case ROTATE_WINDOWS:
@@ skipping 117 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash