Introduce WindowStateDelegate::ToggleFullscreen

ash/wm/window_state.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 "ash/wm/window_state.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
+#include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_observer.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/wm_types.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/display.h"
 #include "ui/views/corewm/window_util.h"
 
 namespace ash {
 namespace wm {
 
 // static
 bool WindowState::IsMaximizedOrFullscreenState(ui::WindowShowState show_state) {
   return show_state == ui::SHOW_STATE_FULLSCREEN ||
       show_state == ui::SHOW_STATE_MAXIMIZED;
 }
 
 WindowState::WindowState(aura::Window* window)
     : window_(window),
       tracked_by_workspace_(true),
       window_position_managed_(false),
       bounds_changed_by_user_(false),
       panel_attached_(true),
       continue_drag_after_reparent_(false),
       ignored_by_shelf_(false),
       can_consume_system_keys_(false),
       top_row_keys_are_function_keys_(false),
       always_restores_to_restore_bounds_(false),
+      animate_to_fullscreen_(true),
       window_show_type_(ToWindowShowType(GetShowState())) {
   window_->AddObserver(this);
 }
 
 WindowState::~WindowState() {
 }
 
+void WindowState::SetDelegate(WindowStateDelegate* delegate) {
+  DCHECK(!delegate_.get());
+  delegate_.reset(delegate);
+}
+
 ui::WindowShowState WindowState::GetShowState() const {
   return window_->GetProperty(aura::client::kShowStateKey);
 }
 
 bool WindowState::IsMinimized() const {
   return GetShowState() == ui::SHOW_STATE_MINIMIZED;
 }
 
 bool WindowState::IsMaximized() const {
   return GetShowState() == ui::SHOW_STATE_MAXIMIZED;
@@ skipping 80 matching lines @@
 
 void WindowState::Activate() {
   ActivateWindow(window_);
 }
 
 void WindowState::Deactivate() {
   DeactivateWindow(window_);
 }
 
 void WindowState::Restore() {
   window_->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);

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

In a future CL, you will need to make Restore() call delegate_->ExitFullscreen()
if the window is currently in fullscreen.

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

See my comment below.

 }
 
 void WindowState::ToggleMaximized() {
   if (IsMaximized())
     Restore();
   else if (CanMaximize())
     Maximize();
 }
 
+void WindowState::ToggleFullscreen() {
+  if (delegate_ && delegate_->ToggleFullscreen(this))
+    return;
+  if (IsFullscreen()) {
+    Restore();

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

When exiting fullscreen, we should ideally have the same behavior as
NativeWidgetAura::SetFullscreen(). I am fine if you do this as a separate CL
though.

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

I think ash should restore to previous state, instead of views::Widget. This is
one of things I'm planning to do as a part
of restore improvement.

+  } else {
+    window_->SetProperty(aura::client::kShowStateKey,
+                         ui::SHOW_STATE_FULLSCREEN);
+  }
+}
+
 void WindowState::SetBoundsInScreen(
     const gfx::Rect& bounds_in_screen) {
   gfx::Rect bounds_in_parent =
       ScreenAsh::ConvertRectFromScreen(window_->parent(),
                                        bounds_in_screen);
   window_->SetBounds(bounds_in_parent);
 }
 
 void WindowState::SaveCurrentBoundsForRestore() {
   gfx::Rect bounds_in_screen =
@@ skipping 102 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash