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_util.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 68 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());

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

This class needs a WindowStateDelegate.
With the CL as is, pressing <F4> while in tab fullscreen does not get rid of the
fullscreen exit bubble

[oshima, 2013/10/29 02:05:42]

Sorry I misunderstood your original comment. Fixed.

+  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() &&
-      !browser_view->browser()->is_session_restore())
+  if (!browser->bounds_overridden() && !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->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);
   }
 }