Chromium Code Reviews| Index: ash/aura/wm_window_aura.cc |
| diff --git a/ash/aura/wm_window_aura.cc b/ash/aura/wm_window_aura.cc |
| index a46b56f50adc35e58407d139afa7ee42ab5f1221..25e258ec28ddb536d6c008ba24042610b1b49063 100644 |
| --- a/ash/aura/wm_window_aura.cc |
| +++ b/ash/aura/wm_window_aura.cc |
| @@ -303,6 +303,14 @@ void WmWindowAura::SetIntProperty(WmWindowProperty key, int value) { |
| NOTREACHED(); |
| } |
| +gfx::Rect* WmWindowAura::GetRectProperty(WmWindowProperty key) { |
| + if (key == WmWindowProperty::VK_NEW_BOUNDS) |
| + return window_->GetProperty(aura::client::kVKNewBoundsKey); |
| + |
| + NOTREACHED(); |
| + return new gfx::Rect(); |
|
sky
2016/08/17 15:11:50
This leaks. Can you return null?
|
| +} |
| + |
| ShelfItemDetails* WmWindowAura::GetShelfItemDetails() { |
| return window_->GetProperty(kShelfItemDetailsKey); |
| } |
| @@ -780,6 +788,8 @@ void WmWindowAura::OnWindowPropertyChanged(aura::Window* window, |
| wm_property = WmWindowProperty::TOP_VIEW_INSET; |
| } else if (key == aura::client::kExcludeFromMruKey) { |
| wm_property = WmWindowProperty::EXCLUDE_FROM_MRU; |
| + } else if (key == aura::client::kVKNewBoundsKey) { |
| + wm_property = WmWindowProperty::VK_NEW_BOUNDS; |
| } else { |
| return; |
| } |