Introduce WindowStateDelegate::ToggleFullscreen

chrome/browser/ui/views/apps/native_app_window_views.cc

Index: chrome/browser/ui/views/apps/native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/chrome/browser/ui/views/apps/native_app_window_views.cc
index d5d39fd972f89ea464974c3224b1967934312c08..7b21b40af31e36f47dc26df6a0623f258019d19e 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.cc
+++ b/chrome/browser/ui/views/apps/native_app_window_views.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/ui/views/apps/native_app_window_views.h"
 
+#include "apps/shell_window.h"
 #include "apps/ui/views/shell_window_frame_view.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -13,6 +14,7 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
@@ -46,6 +48,7 @@
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/panels/panel_frame_view.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_delegate.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
@@ -120,6 +123,34 @@ void CreateIconAndSetRelaunchDetails(
 }
 #endif
 
+#if defined(USE_ASH)
+// This class handles a user's fullscreen request (Shift+F4/F4).
+class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate {
+ public:
+  explicit NativeAppWindowStateDelegate(ShellWindow* shell_window)
+      : shell_window_(shell_window) {
+    DCHECK(shell_window_);
+  }
+  virtual ~NativeAppWindowStateDelegate(){}
+
+  // Overridden from ash::wm::WindowStateDelegate.
+  virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {
+    // Windows which cannot be maximized should not be fullscreened.
+    DCHECK(window_state->IsFullscreen() || window_state->CanMaximize());
+    if (window_state->IsFullscreen())
+      shell_window_->Restore();
+    else if (window_state->CanMaximize())
+      shell_window_->Fullscreen();
+    return true;
+  }
+
+ private:
+  ShellWindow* shell_window_;  // not owned.
+
+  DISALLOW_COPY_AND_ASSIGN(NativeAppWindowStateDelegate);
+};
+#endif  // USE_ASH
+
 }  // namespace
 
 NativeAppWindowViews::NativeAppWindowViews(
@@ -151,6 +182,13 @@ NativeAppWindowViews::NativeAppWindowViews(
 
   OnViewWasResized();
   window_->AddObserver(this);
+#if defined(USE_ASH)
+  if (chrome::GetHostDesktopTypeForNativeView(GetNativeWindow()) ==
+      chrome::HOST_DESKTOP_TYPE_ASH) {
+    ash::wm::GetWindowState(GetNativeWindow())->SetDelegate(

[sky, 2013/10/29 20:52:21]

Can SetDelegate take a scoped_ptr so I don't have to look through the code to
figure out ownership?

[oshima, 2013/10/29 22:54:42]

Done.

+        new NativeAppWindowStateDelegate(shell_window));
+  }
+#endif
 }
 
 NativeAppWindowViews::~NativeAppWindowViews() {