| Index: views/widget/native_widget_views.h
|
| ===================================================================
|
| --- views/widget/native_widget_views.h (revision 98696)
|
| +++ views/widget/native_widget_views.h (working copy)
|
| @@ -78,9 +78,8 @@
|
| virtual bool HasMouseCapture() const OVERRIDE;
|
| virtual InputMethod* CreateInputMethod() OVERRIDE;
|
| virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
|
| - virtual void GetWindowPlacement(
|
| - gfx::Rect* bounds,
|
| - ui::WindowShowState* show_state) const OVERRIDE;
|
| + virtual void GetWindowBoundsAndMaximizedState(gfx::Rect* bounds,
|
| + bool* maximized) const OVERRIDE;
|
| virtual void SetWindowTitle(const std::wstring& title) OVERRIDE;
|
| virtual void SetWindowIcons(const SkBitmap& window_icon,
|
| const SkBitmap& app_icon) OVERRIDE;
|
| @@ -105,7 +104,7 @@
|
| virtual void Hide() OVERRIDE;
|
| virtual void ShowMaximizedWithBounds(
|
| const gfx::Rect& restored_bounds) OVERRIDE;
|
| - virtual void ShowWithWindowState(ui::WindowShowState window_state) OVERRIDE;
|
| + virtual void ShowWithState(ShowState state) OVERRIDE;
|
| virtual bool IsVisible() const OVERRIDE;
|
| virtual void Activate() OVERRIDE;
|
| virtual void Deactivate() OVERRIDE;
|
|
|