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() {}

[pkotwicz, 2013/10/25 23:31:14]

I would much rather have a Browser* parameter be passed in.

[oshima, 2013/10/28 22:57:51]

Done.

+  virtual ~BrowserWindowStateDelegate(){}
+
+  // Invoked when the user uses Shift+F4 to toggle the window fullscreen state.

[pkotwicz, 2013/10/25 23:31:14]

Shift+F4 -> F4

[oshima, 2013/10/28 22:57:51]

Changed to Shift+F4/F4

+  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());
+    CHECK(browser);
+    if (is_fullscreen) {
+      chrome::ToggleFullscreenMode(browser);
+      return true;
+    }
+    // AppNonClientFrameViewAsh shows only the window controls and no other

[pkotwicz, 2013/10/25 23:31:14]

Would it be possible to set a custom delegate in AppNonClientFrameViewAsh to do
this handling? This change will make me happy :)
This changes the caveat that WindowState::SetDelegate() will only be called once
for a given WindowState object. (I will need to change that anyways for
CustomFrameViewAsh though)

[oshima, 2013/10/28 22:57:51]

Done.

+    // 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 21 matching lines @@
       // an OnBoundsChanged event so that the frame will change its size
       // properly.
       browser_frame_->non_client_view()->UpdateFrame(
           old_state == ui::SHOW_STATE_MINIMIZED);
     }
   }
 
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
                                      const gfx::Rect& new_bounds) OVERRIDE {
     // Don't do anything if we don't have our non-client view yet.

[pkotwicz, 2013/10/25 23:31:14]

Can you do me a favor and remove this method?

[pkotwicz, 2013/10/25 23:34:14]

I was going to remove it as part of https://codereview.chromium.org/25536010/
but we did a complete redesign

[oshima, 2013/10/28 22:57:51]

I'm happy to create CL, but may I do this in separate CL? I want to make sure my
CL won't change the behavior.

[pkotwicz, 2013/10/29 00:46:01]

I'll post a CL to remove this tomorrow (Tuesday)

     if (!browser_frame_->non_client_view())
       return;
 
     // If the window just moved to the top of the screen, or just moved away
     // from it, invoke Layout() so the header size can change.
     if ((old_bounds.y() == 0 && new_bounds.y() != 0) ||
         (old_bounds.y() != 0 && new_bounds.y() == 0))
       browser_frame_->non_client_view()->Layout();
   }
 
@@ skipping 10 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());
 
   // 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() &&

[pkotwicz, 2013/10/25 23:31:14]

Might as well use |browser| in the remainder of the function

[oshima, 2013/10/28 22:57:51]

Done.

       !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);
   }
 }