Introduce WindowStateDelegate::ToggleFullscreen

chrome/browser/ui/views/frame/browser_frame_ash.cc

 // Copyright 2013 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 "chrome/browser/ui/views/frame/browser_frame_ash.h"
 
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_util.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/views/view.h"
 
 using aura::Window;
 
+namespace {
+class BrowserWindowStateDelegate : public ash::wm::WindowStateDelegate {
+ public:
+  BrowserWindowStateDelegate() {}
+  virtual ~BrowserWindowStateDelegate(){}
+
+  // Invoked when the user uses Shift+F4 to toggle the window fullscreen state.
+  virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {
+    bool is_fullscreen = window_state->IsFullscreen();
+
+    // Windows which cannot be maximized should not be fullscreened.
+    if (!is_fullscreen && !window_state->CanMaximize())
+      return true;
+
+    Browser* browser = chrome::FindBrowserWithWindow(window_state->window());
+    DCHECK(browser);

[pkotwicz, 2013/10/25 19:56:38]

I would make this CHECK() and remmove the following if statement

[oshima, 2013/10/25 22:36:20]

Done.

+    if (!browser)
+      return true;
+    if (is_fullscreen) {
+      chrome::ToggleFullscreenMode(browser);
+      return true;
+    }
+    // AppNonClientFrameViewAsh shows only the window controls and no other
+    // window decorations which is pretty close to fullscreen. Put v1 apps
+    // into maximized mode instead of fullscreen to avoid showing the ugly
+    // fullscreen exit bubble.
+    if (browser->is_app() && browser->app_type() != Browser::APP_TYPE_CHILD)
+      window_state->ToggleMaximized();
+    else
+      chrome::ToggleFullscreenMode(browser);
+    return true;
+  }
+ private:
+  DISALLOW_COPY_AND_ASSIGN(BrowserWindowStateDelegate);
+};
+
+}  // namespace
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAsh::WindowPropertyWatcher
 
 class BrowserFrameAsh::WindowPropertyWatcher : public aura::WindowObserver {
  public:
   explicit WindowPropertyWatcher(BrowserFrameAsh* browser_frame_ash,
                                  BrowserFrame* browser_frame)
       : browser_frame_ash_(browser_frame_ash),
         browser_frame_(browser_frame) {}
 
@@ skipping 52 matching lines @@
 // static
 const char BrowserFrameAsh::kWindowName[] = "BrowserFrameAsh";
 
 BrowserFrameAsh::BrowserFrameAsh(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetAura(browser_frame),
       browser_view_(browser_view),
       window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) {
   GetNativeWindow()->SetName(kWindowName);
   GetNativeWindow()->AddObserver(window_property_watcher_.get());
-  if (browser_view->browser()->is_type_tabbed())
-    ash::wm::SetAnimateToFullscreen(GetNativeWindow(), false);
+  Browser* browser = browser_view->browser();
+  ash::wm::WindowState* window_state =
+      ash::wm::GetWindowState(GetNativeWindow());
+  window_state->SetDelegate(new BrowserWindowStateDelegate());
+  window_state->set_animate_to_fullscreen(!browser->is_type_tabbed());

[pkotwicz, 2013/10/25 19:56:38]

FYI: This property seems to be to avoid animating to immersive fullscreen and to
tab fullscreen. It is going to be fun to make this work properly once v1 and v2
apps can be some of the time put into immersive fullscreen.

 
   // Turn on auto window management if we don't need an explicit bounds.
   // This way the requested bounds are honored.
   if (!browser_view->browser()->bounds_overridden() &&
       !browser_view->browser()->is_session_restore())
     SetWindowAutoManaged();
 #if defined(OS_CHROMEOS)
   // For legacy reasons v1 apps (like Secure Shell) are allowed to consume keys
   // like brightness, volume, etc. Otherwise these keys are handled by the
   // Ash window manager.
-  if (browser_view->browser()->is_app()) {
-    ash::wm::GetWindowState(GetNativeWindow())->
-        set_can_consume_system_keys(true);
-  }
+  window_state->set_can_consume_system_keys(browser_view->browser()->is_app());
 #endif  // defined(OS_CHROMEOS)
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAsh, views::NativeWidgetAura overrides:
 
 void BrowserFrameAsh::OnWindowDestroying() {
   // Window is destroyed before our destructor is called, so clean up our
   // observer here.
   GetNativeWindow()->RemoveObserver(window_property_watcher_.get());
@@ skipping 37 matching lines @@
 BrowserFrameAsh::~BrowserFrameAsh() {
 }
 
 void BrowserFrameAsh::SetWindowAutoManaged() {
   if (browser_view_->browser()->type() != Browser::TYPE_POPUP ||
       browser_view_->browser()->is_app()) {
     ash::wm::GetWindowState(GetNativeWindow())->
         set_window_position_managed(true);
   }
 }