NativeWidgetViews: Implement Maximize.

views/widget/native_widget_views.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_views.h"
 
 #include "ui/gfx/compositor/compositor.h"
-#include "views/desktop/desktop_window_view.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget_view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/window_manager.h"
 
 #if defined(HAVE_IBUS)
 #include "views/ime/input_method_ibus.h"
 #else
 #include "views/ime/mock_input_method.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetViews, public:
 
 NativeWidgetViews::NativeWidgetViews(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       view_(NULL),
       active_(false),
-      minimized_(false),
+      window_state_(ui::SHOW_STATE_DEFAULT),
       always_on_top_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       delete_native_view_(true) {
 }
 
 NativeWidgetViews::~NativeWidgetViews() {
   delegate_->OnNativeWidgetDestroying();
 
   if (view_ && delete_native_view_) {
@@ skipping 358 matching lines @@
 
 void NativeWidgetViews::SetAlwaysOnTop(bool on_top) {
   always_on_top_ = on_top;
   // This is not complete yet. At least |MoveToTop| will need to be updated to
   // make sure a 'normal' window does not get on top of a window with
   // |always_on_top_| set.
   NOTIMPLEMENTED();
 }
 
 void NativeWidgetViews::Maximize() {
-  NOTIMPLEMENTED();
+  if (window_state_ == ui::SHOW_STATE_MAXIMIZED)
+    return;
+
+  // Remember bounds and transform to use when unmaximized.
+  restored_bounds_ = view_->bounds();

[sky, 2011/09/22 17:59:10]

Should we only do this if we're not minimized?

[sadrul, 2011/09/22 18:24:45]

Yep. Good catch. Made this change here and also in ::Minimize.

+  restored_transform_ = view_->GetTransform();
+
+  window_state_ = ui::SHOW_STATE_MAXIMIZED;
+  gfx::Size size = GetParentNativeWidget()->GetWindowScreenBounds().size();
+  SetBounds(gfx::Rect(gfx::Point(), size));
 }
 
 void NativeWidgetViews::Minimize() {
   gfx::Rect view_bounds = view_->bounds();
   gfx::Rect parent_bounds = view_->parent()->bounds();
 
   restored_bounds_ = view_bounds;
   restored_transform_ = view_->GetTransform();
 
   float aspect_ratio = static_cast<float>(view_bounds.width()) /
@@ skipping 10 matching lines @@
   int target_y = parent_bounds.height() - target_size - 20;
 
   view_->SetBounds(
       target_x, target_y, view_bounds.width(), view_bounds.height());
 
   ui::Transform transform;
   transform.SetScale((float)target_width / (float)view_bounds.width(),
                      (float)target_height / (float)view_bounds.height());
   view_->SetTransform(transform);
 
-  minimized_ = true;
+  window_state_ = ui::SHOW_STATE_MINIMIZED;
 }
 
 bool NativeWidgetViews::IsMaximized() const {
-  // NOTIMPLEMENTED();
-  return false;
+  return window_state_ == ui::SHOW_STATE_MAXIMIZED;
 }
 
 bool NativeWidgetViews::IsMinimized() const {
-  return minimized_;
+  return window_state_ == ui::SHOW_STATE_MINIMIZED;
 }
 
 void NativeWidgetViews::Restore() {
-  minimized_ = false;
+  window_state_ = ui::SHOW_STATE_NORMAL;
   view_->SetBoundsRect(restored_bounds_);
   view_->SetTransform(restored_transform_);
 }
 
 void NativeWidgetViews::SetFullscreen(bool fullscreen) {
   NOTIMPLEMENTED();
 }
 
 bool NativeWidgetViews::IsFullscreen() const {
   // NOTIMPLEMENTED();
@@ skipping 113 matching lines @@
       }
       default:
         // Everything else falls into standard client event handling.
         break;
     }
   }
   return false;
 }
 
 }  // namespace views