diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 15:38:44 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-01 15:38:44 +0000 |
| commit | f7cfed2b7ba91d02d6eaae8dcb62b00456ca6627 (patch) | |
| tree | a42f41631febac9416bf0dc94e1dd5ff7f85342b /views | |
| parent | 0ae05c4c1d191faf471bd53e051dcaedb1e3fe05 (diff) | |
| download | chromium_src-f7cfed2b7ba91d02d6eaae8dcb62b00456ca6627.zip chromium_src-f7cfed2b7ba91d02d6eaae8dcb62b00456ca6627.tar.gz chromium_src-f7cfed2b7ba91d02d6eaae8dcb62b00456ca6627.tar.bz2 | |
Update NativeWidgetAura for new views API changes.
BUG=none
TEST=compiles with use_aura=1
TBR=dhollowa
Review URL: http://codereview.chromium.org/7831006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_aura.cc | 7 | ||||
| -rw-r--r-- | views/widget/native_widget_aura.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index b206504..fc5e5bb 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -163,8 +163,9 @@ void NativeWidgetAura::CenterWindow(const gfx::Size& size) { NOTIMPLEMENTED(); } -void NativeWidgetAura::GetWindowBoundsAndMaximizedState(gfx::Rect* bounds, - bool* maximized) const { +void NativeWidgetAura::GetWindowPlacement( + gfx::Rect* bounds, + ui::WindowShowState* maximized) const { NOTIMPLEMENTED(); } @@ -258,7 +259,7 @@ void NativeWidgetAura::ShowMaximizedWithBounds( NOTIMPLEMENTED(); } -void NativeWidgetAura::ShowWithState(ShowState state) { +void NativeWidgetAura::ShowWithWindowState(ui::WindowShowState state) { NOTIMPLEMENTED(); } diff --git a/views/widget/native_widget_aura.h b/views/widget/native_widget_aura.h index 9fee3ab..8c1f495 100644 --- a/views/widget/native_widget_aura.h +++ b/views/widget/native_widget_aura.h @@ -54,8 +54,9 @@ class NativeWidgetAura : public internal::NativeWidgetPrivate, 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* maximized) const OVERRIDE; virtual void SetWindowTitle(const std::wstring& title) OVERRIDE; virtual void SetWindowIcons(const SkBitmap& window_icon, const SkBitmap& app_icon) OVERRIDE; @@ -80,7 +81,7 @@ class NativeWidgetAura : public internal::NativeWidgetPrivate, virtual void Hide() OVERRIDE; virtual void ShowMaximizedWithBounds( const gfx::Rect& restored_bounds) OVERRIDE; - virtual void ShowWithState(ShowState state) OVERRIDE; + virtual void ShowWithWindowState(ui::WindowShowState state) OVERRIDE; virtual bool IsVisible() const OVERRIDE; virtual void Activate() OVERRIDE; virtual void Deactivate() OVERRIDE; |