Move maximize/fullscreen/restore to shell

views/widget/native_widget_aura.cc

 // Copyright (c) 2011 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 "views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
+#include "ui/aura/aura_constants.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "views/widget/native_widget_delegate.h"
@@ skipping 48 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetAura::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   window_->set_user_data(this);
   Widget::InitParams::Type window_type =
       params.child ? Widget::InitParams::TYPE_CONTROL : params.type;
-  SetNativeWindowProperty(kWindowTypeKey, reinterpret_cast<void*>(window_type));
+  window_->SetIntProperty(kWindowTypeKey, window_type);
+  window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
   window_->SetType(window_type == Widget::InitParams::TYPE_CONTROL ?
                    aura::kWindowType_Control : aura::kWindowType_None);
   window_->Init(params.create_texture_for_layer ?
                 ui::Layer::LAYER_HAS_TEXTURE : ui::Layer::LAYER_HAS_NO_TEXTURE);
   // TODO(beng): respect |params| authoritah wrt transparency.
   window_->layer()->SetFillsBoundsOpaquely(false);
   delegate_->OnNativeWidgetCreated();
   window_->set_minimum_size(delegate_->GetMinimumSize());
   window_->SetBounds(params.bounds);
   if (params.type == Widget::InitParams::TYPE_CONTROL) {
@@ skipping 130 matching lines @@
   const gfx::Rect parent_bounds = window_->parent()->bounds();
   window_->SetBounds(gfx::Rect((parent_bounds.width() - size.width())/2,
                                (parent_bounds.height() - size.height())/2,
                                size.width(),
                                size.height()));
 }
 
 void NativeWidgetAura::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* maximized) const {
-  *maximized = window_->show_state();
+  *maximized = static_cast<ui::WindowShowState>(
+      window_->GetIntProperty(aura::kShowStateKey));
 }
 
 void NativeWidgetAura::SetWindowTitle(const string16& title) {
   // Aura doesn't have native window frames.
 }
 
 void NativeWidgetAura::SetWindowIcons(const SkBitmap& window_icon,
                                      const SkBitmap& app_icon) {
   // Aura doesn't have window icons.
 }
@@ skipping 75 matching lines @@
   window_->Show();
 }
 
 void NativeWidgetAura::Hide() {
   window_->Hide();
 }
 
 void NativeWidgetAura::ShowMaximizedWithBounds(
     const gfx::Rect& restored_bounds) {
   window_->SetBounds(restored_bounds);
-  window_->Maximize();
+  window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   window_->Show();
 }
 
 void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) {
-  switch(state) {
-    case ui::SHOW_STATE_MAXIMIZED:
-      window_->Maximize();
-      break;
-    case ui::SHOW_STATE_FULLSCREEN:
-      window_->Fullscreen();
-      break;
-    default:
-      break;
+  if (state == ui::SHOW_STATE_MAXIMIZED ||
+      state == ui::SHOW_STATE_FULLSCREEN) {
+    window_->SetIntProperty(aura::kShowStateKey, state);
   }
   window_->Show();
 }
 
 bool NativeWidgetAura::IsVisible() const {
   return window_->IsVisible();
 }
 
 void NativeWidgetAura::Activate() {
   window_->Activate();
 }
 
 void NativeWidgetAura::Deactivate() {
   window_->Deactivate();
 }
 
 bool NativeWidgetAura::IsActive() const {
   return aura::Desktop::GetInstance()->active_window() == window_;
 }
 
 void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetAura::Maximize() {
-  window_->Maximize();
+  window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
 void NativeWidgetAura::Minimize() {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetAura::IsMaximized() const {
-  return window_->show_state() == ui::SHOW_STATE_MAXIMIZED;
+  return window_->GetIntProperty(aura::kShowStateKey) ==
+      ui::SHOW_STATE_MAXIMIZED;
 }
 
 bool NativeWidgetAura::IsMinimized() const {
-  return window_->show_state() == ui::SHOW_STATE_MINIMIZED;
+  return window_->GetIntProperty(aura::kShowStateKey) ==
+      ui::SHOW_STATE_MINIMIZED;
 }
 
 void NativeWidgetAura::Restore() {
-  window_->Restore();
+  window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
 }
 
 void NativeWidgetAura::SetFullscreen(bool fullscreen) {
-  fullscreen ? window_->Fullscreen() : window_->Restore();
+  window_->SetIntProperty(
+      aura::kShowStateKey,
+      fullscreen ? ui::SHOW_STATE_FULLSCREEN : ui::SHOW_STATE_NORMAL);
 }
 
 bool NativeWidgetAura::IsFullscreen() const {
-  return window_->show_state() == ui::SHOW_STATE_FULLSCREEN;
+  return window_->GetIntProperty(aura::kShowStateKey) ==
+      ui::SHOW_STATE_FULLSCREEN;
 }
 
 void NativeWidgetAura::SetOpacity(unsigned char opacity) {
   window_->layer()->SetOpacity(opacity / 255.0);
 }
 
 void NativeWidgetAura::SetUseDragFrame(bool use_drag_frame) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 147 matching lines @@
 
 void NativeWidgetAura::OnWindowDestroying() {
   delegate_->OnNativeWidgetDestroying();
 
   // If the aura::Window is destroyed, we can no longer show tooltips.
   tooltip_manager_.reset();
 }
 
 void NativeWidgetAura::OnWindowDestroyed() {
   window_ = NULL;
+  tooltip_manager_.reset();
   delegate_->OnNativeWidgetDestroyed();
   if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
     delete this;
 }
 
 void NativeWidgetAura::OnWindowVisibilityChanged(bool visible) {
   delegate_->OnNativeWidgetVisibilityChanged(visible);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 82 matching lines @@
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace internal
 }  // namespace views