| Index: apps/ui/views/native_app_window_views.h
|
| diff --git a/apps/ui/views/native_app_window_views.h b/apps/ui/views/native_app_window_views.h
|
| index d8147f37ec9d3d260fe6fea5d60994f9f7761be5..f22cea9cac4dbe7666297d6c6d2b01526550ce22 100644
|
| --- a/apps/ui/views/native_app_window_views.h
|
| +++ b/apps/ui/views/native_app_window_views.h
|
| @@ -150,10 +150,10 @@ class NativeAppWindowViews : public NativeAppWindow,
|
| virtual void HideWithApp() OVERRIDE;
|
| virtual void ShowWithApp() OVERRIDE;
|
| virtual void UpdateShelfMenu() OVERRIDE;
|
| - virtual gfx::Size GetMinimumSize() const OVERRIDE;
|
| - virtual void SetMinimumSize(const gfx::Size& size) OVERRIDE;
|
| - virtual gfx::Size GetMaximumSize() const OVERRIDE;
|
| - virtual void SetMaximumSize(const gfx::Size& size) OVERRIDE;
|
| + virtual gfx::Size GetContentMinimumSize() const OVERRIDE;
|
| + virtual void SetContentMinimumSize(const gfx::Size& size) OVERRIDE;
|
| + virtual gfx::Size GetContentMaximumSize() const OVERRIDE;
|
| + virtual void SetContentMaximumSize(const gfx::Size& size) OVERRIDE;
|
|
|
| // web_modal::WebContentsModalDialogHost implementation.
|
| virtual gfx::NativeView GetHostView() const OVERRIDE;
|
|
|