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 632 matching lines @@
       // 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: {
+      if (key_code == ui::VKEY_F4 && shell->delegate())
+        shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_MAXIMIZE_RESTORE);
       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)

[sky, 2012/09/12 14:57:33]

Is it intentional that hitting this button cycles windows if none are active?

[sschmitz, 2012/09/12 23:45:50]

After conferring with PM and sky@, took it out.
Done.

[mazda, 2012/09/13 00:26:00]

This is for http://crbug.com/133337. 
If we've decided not to support restoring windows in launcher by this command,
line 639-642 should also be modified.

[sschmitz, 2012/09/13 19:34:13]

On further discussion PM decided to leave as is.

         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) && shell->delegate())

[sky, 2012/09/12 14:57:33]

On looking at this, why do you even need this? Doens't 662 handle this?

[sschmitz, 2012/09/12 23:45:50]

Yes. We get out of fullscreen mode when F4 is pressed.

[sky, 2012/09/13 00:46:22]

My question is, why do you need to route to the delegate at all here? Does
wm::RestoreWindow do the right thing if the window is fullscreen?

[sschmitz, 2012/09/13 19:34:13]

Two Reasons for this:
1. PM changed behavior when in Fullscreen, we will got to "not fullscreen" but
leave the window maximized or restored as it was before fullscreen.
2. 662 did not cleanup. The FullscreenExitBubble hung around for a few secs
(when you pressed F4 immediately after going to fullscreen)

[sky, 2012/09/13 19:36:33]

If that's the case, then it probably means BrowserFrameAura is not cleaning up
when the window state changes. BrowserFrameAura should listen for when the
window goes out of fullscreen mode and hide the bubble.

+        shell->delegate()->RemoveFullScreenExitBubble();
+      if (wm::IsWindowFullscreen(window) || wm::IsWindowMaximized(window))
+        wm::RestoreWindow(window);
+      else
+        wm::MaximizeWindow(window);

[sky, 2012/09/12 14:57:33]

This is problematic, it assumes all windows can maximized which isn't the case.
You need to add a property indicating if a window can be maximized and honor
that.

[sschmitz, 2012/09/12 23:45:50]

Added wm::CanMaximizeWindow(window)(thanks sadrul@!)

+      return true;
       break;
     }
     case WINDOW_POSITION_CENTER: {
       aura::Window* window = wm::GetActiveWindow();
       if (window) {
         wm::CenterWindow(window);
         return true;
       }
       break;
     }
@@ skipping 118 matching lines @@
     accelerators_.insert(
         std::make_pair(accelerator, accelerators[i].action));
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash