| Index: views/widget/native_widget_win.h
|
| diff --git a/views/widget/native_widget_win.h b/views/widget/native_widget_win.h
|
| index c29d354a8c0aad32388417baf8e3f297b5379ae2..3cfa9c647cb1ba16a8db067396e78ab3889c5159 100644
|
| --- a/views/widget/native_widget_win.h
|
| +++ b/views/widget/native_widget_win.h
|
| @@ -209,8 +209,9 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
|
| virtual bool HasMouseCapture() const OVERRIDE;
|
| virtual InputMethod* CreateInputMethod() OVERRIDE;
|
| virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
|
| - virtual void GetWindowBoundsAndMaximizedState(gfx::Rect* bounds,
|
| - bool* maximized) const OVERRIDE;
|
| + virtual void GetWindowPlacement(
|
| + gfx::Rect* bounds,
|
| + ui::WindowShowState* show_state) const OVERRIDE;
|
| virtual void SetWindowTitle(const std::wstring& title) OVERRIDE;
|
| virtual void SetWindowIcons(const SkBitmap& window_icon,
|
| const SkBitmap& app_icon) OVERRIDE;
|
| @@ -235,7 +236,7 @@ class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
|
| virtual void Hide() OVERRIDE;
|
| virtual void ShowMaximizedWithBounds(
|
| const gfx::Rect& restored_bounds) OVERRIDE;
|
| - virtual void ShowWithState(ShowState state) OVERRIDE;
|
| + virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE;
|
| virtual bool IsVisible() const OVERRIDE;
|
| virtual void Activate() OVERRIDE;
|
| virtual void Deactivate() OVERRIDE;
|
|
|