| Index: ash/mus/bridge/wm_window_mus.cc
|
| diff --git a/ash/mus/bridge/wm_window_mus.cc b/ash/mus/bridge/wm_window_mus.cc
|
| index 1b8db8eca743ac72736fc75a717a0e52cd875fd2..d779cf4ec90edc4f0d88f0c55e6fc8ef80a5131a 100644
|
| --- a/ash/mus/bridge/wm_window_mus.cc
|
| +++ b/ash/mus/bridge/wm_window_mus.cc
|
| @@ -272,7 +272,9 @@ gfx::Rect WmWindowMus::ConvertRectFromScreen(const gfx::Rect& rect) const {
|
| }
|
|
|
| gfx::Size WmWindowMus::GetMinimumSize() const {
|
| - return widget_ ? widget_->GetMinimumSize() : gfx::Size();
|
| + return widget_ && !use_empty_minimum_size_for_testing_
|
| + ? widget_->GetMinimumSize()
|
| + : gfx::Size();
|
| }
|
|
|
| gfx::Size WmWindowMus::GetMaximumSize() const {
|
| @@ -356,6 +358,12 @@ void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) {
|
| return;
|
| }
|
|
|
| + if (key == WmWindowProperty::TOP_VIEW_INSET) {
|
| + // TODO: need support for TOP_VIEW_INSET: http://crbug.com/615100.
|
| + NOTIMPLEMENTED();
|
| + return;
|
| + }
|
| +
|
| NOTREACHED();
|
| }
|
|
|
|
|