Index: views/widget/native_widget_private.h |
diff --git a/views/widget/native_widget_private.h b/views/widget/native_widget_private.h |
index df332cf1cc8cd3db6535fd8f0989073e705c3021..dbeab1226fba2666914e0586982043f6126412fc 100644 |
--- a/views/widget/native_widget_private.h |
+++ b/views/widget/native_widget_private.h |
@@ -137,10 +137,11 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget, |
// Centers the window and sizes it to the specified size. |
virtual void CenterWindow(const gfx::Size& size) = 0; |
- // Retrieves the window's current restored bounds and maximized state, for |
+ // Retrieves the window's current restored bounds and "show" state, for |
// persisting. |
- virtual void GetWindowBoundsAndMaximizedState(gfx::Rect* bounds, |
- bool* maximized) const = 0; |
+ virtual void GetWindowPlacement( |
+ gfx::Rect* bounds, |
+ ui::WindowShowState* show_state) const = 0; |
// Sets the NativeWindow title. |
virtual void SetWindowTitle(const std::wstring& title) = 0; |
@@ -156,12 +157,6 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget, |
virtual void SetAccessibleRole(ui::AccessibilityTypes::Role role) = 0; |
virtual void SetAccessibleState(ui::AccessibilityTypes::State state) = 0; |
- enum ShowState { |
- SHOW_RESTORED, |
- SHOW_MAXIMIZED, |
- SHOW_INACTIVE |
- }; |
- |
// Makes the NativeWindow modal. |
virtual void BecomeModal() = 0; |
@@ -184,7 +179,7 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget, |
// Invoked if the initial show should maximize the window. |restored_bounds| |
// is the bounds of the window when not maximized. |
virtual void ShowMaximizedWithBounds(const gfx::Rect& restored_bounds) = 0; |
- virtual void ShowWithState(ShowState state) = 0; |
+ virtual void ShowWithWindowState(ui::WindowShowState show_state) = 0; |
virtual bool IsVisible() const = 0; |
virtual void Activate() = 0; |
virtual void Deactivate() = 0; |