| Index: views/widget/widget.h
|
| diff --git a/views/widget/widget.h b/views/widget/widget.h
|
| index 70e527c57b694a787bc2d9d9144682fac2c3b9ef..e51e2ee2973e3d81a13d764a1ced044ccbc6ad50 100644
|
| --- a/views/widget/widget.h
|
| +++ b/views/widget/widget.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "ui/base/accessibility/accessibility_types.h"
|
| +#include "ui/base/ui_base_types.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/rect.h"
|
| #include "views/focus/focus_manager.h"
|
| @@ -158,8 +159,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| Ownership ownership;
|
| bool mirror_origin_in_rtl;
|
| bool has_dropshadow;
|
| - // Whether the widget should be maximized.
|
| - bool maximize;
|
| + // Whether the widget should be maximized or minimized.
|
| + ui::WindowShowState show_state;
|
| // Should the widget be double buffered? Default is false.
|
| bool double_buffer;
|
| gfx::NativeView parent;
|
| @@ -651,16 +652,16 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| // Returns whether capture should be released on mouse release.
|
| virtual bool ShouldReleaseCaptureOnMouseReleased() const;
|
|
|
| - // Persists the window's restored position and maximized state using the
|
| + // Persists the window's restored position and "show" state using the
|
| // window delegate.
|
| void SaveWindowPosition();
|
|
|
| // Sizes and positions the window just after it is created.
|
| void SetInitialBounds(const gfx::Rect& bounds);
|
|
|
| - // Returns the bounds and maximized state from the delegate. Returns true if
|
| + // Returns the bounds and "show" state from the delegate. Returns true if
|
| // the delegate wants to use a specified bounds.
|
| - bool GetSavedBounds(gfx::Rect* bounds, bool* maximize);
|
| + bool GetSavedBounds(gfx::Rect* bounds, ui::WindowShowState* show_state);
|
|
|
| // Sets a different InputMethod instance to this widget. The instance
|
| // must not be initialized, the ownership will be assumed by the widget.
|
| @@ -719,12 +720,12 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| // Set to true if the widget is in the process of closing.
|
| bool widget_closed_;
|
|
|
| - // The saved maximized state for this window. See note in SetInitialBounds
|
| + // The saved "show" state for this window. See note in SetInitialBounds
|
| // that explains why we save this.
|
| - bool saved_maximized_state_;
|
| + ui::WindowShowState saved_show_state_;
|
|
|
| // The restored bounds used for the initial show. This is only used if
|
| - // |saved_maximized_state_| is true.
|
| + // |saved_show_state_| is maximized.
|
| gfx::Rect initial_restored_bounds_;
|
|
|
| // The smallest size the window can be.
|
|
|