| Index: apps/ui/native_app_window.h
|
| diff --git a/apps/ui/native_app_window.h b/apps/ui/native_app_window.h
|
| index 0093a3c89e5d5d27005fc46bb66c4c481b9292e3..12b08d526591d6516fd4e057338a2b6c99a699c0 100644
|
| --- a/apps/ui/native_app_window.h
|
| +++ b/apps/ui/native_app_window.h
|
| @@ -77,16 +77,16 @@ class NativeAppWindow : public ui::BaseWindow,
|
| virtual void UpdateShelfMenu() = 0;
|
|
|
| // Returns the minimum size constraints of the content.
|
| - virtual gfx::Size GetMinimumSize() const = 0;
|
| + virtual gfx::Size GetContentMinimumSize() const = 0;
|
|
|
| // Updates the minimum size constraints of the content.
|
| - virtual void SetMinimumSize(const gfx::Size& size) = 0;
|
| + virtual void SetContentMinimumSize(const gfx::Size& size) = 0;
|
|
|
| // Returns the maximum size constraints of the content.
|
| - virtual gfx::Size GetMaximumSize() const = 0;
|
| + virtual gfx::Size GetContentMaximumSize() const = 0;
|
|
|
| // Updates the maximum size constraints of the content.
|
| - virtual void SetMaximumSize(const gfx::Size& size) = 0;
|
| + virtual void SetContentMaximumSize(const gfx::Size& size) = 0;
|
|
|
| virtual ~NativeAppWindow() {}
|
| };
|
|
|