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 782b1b63edcca06f9aa08d193d3630b1644517f8..15baf4ce19241256cfb56651e1584afb2d921014 100644 |
| --- a/ash/aura/wm_window_aura.cc |
| +++ b/ash/aura/wm_window_aura.cc |
| @@ -450,6 +450,20 @@ void WmWindowAura::SetRestoreShowState(ui::WindowShowState show_state) { |
| window_->SetProperty(aura::client::kRestoreShowStateKey, show_state); |
| } |
| +void WmWindowAura::SetRestoreOverrides( |
| + const gfx::Rect& bounds_override, |
| + ui::WindowShowState window_state_override) { |
| + if (bounds_override.IsEmpty()) { |
| + window_->ClearProperty(ash::kRestoreShowStateOverrideKey); |
|
James Cook
2016/06/27 00:19:21
nit: "ash::" not needed
sky
2016/06/27 15:27:26
Done.
|
| + window_->ClearProperty(ash::kRestoreBoundsOverrideKey); |
| + return; |
| + } |
| + window_->SetProperty(ash::kRestoreShowStateOverrideKey, |
| + window_state_override); |
| + window_->SetProperty(ash::kRestoreBoundsOverrideKey, |
| + new gfx::Rect(bounds_override)); |
| +} |
| + |
| void WmWindowAura::SetLockedToRoot(bool value) { |
| window_->SetProperty(kStayInSameRootWindowKey, value); |
| } |