| Index: ui/aura_shell/toplevel_window_event_filter.cc
|
| ===================================================================
|
| --- ui/aura_shell/toplevel_window_event_filter.cc (revision 114849)
|
| +++ ui/aura_shell/toplevel_window_event_filter.cc (working copy)
|
| @@ -126,7 +126,7 @@
|
| }
|
|
|
| void ToggleMaximizedState(aura::Window* window) {
|
| - window->SetIntProperty(aura::kShowStateKey,
|
| + window->SetIntProperty(aura::client::kShowStateKey,
|
| IsWindowMaximized(window) ?
|
| ui::SHOW_STATE_NORMAL : ui::SHOW_STATE_MAXIMIZED);
|
| }
|
| @@ -208,8 +208,10 @@
|
| return false;
|
|
|
| // Only a normal/default window can be moved/resized.
|
| - if (target->GetIntProperty(aura::kShowStateKey) != ui::SHOW_STATE_NORMAL &&
|
| - target->GetIntProperty(aura::kShowStateKey) != ui::SHOW_STATE_DEFAULT)
|
| + if (target->GetIntProperty(aura::client::kShowStateKey) !=
|
| + ui::SHOW_STATE_NORMAL &&
|
| + target->GetIntProperty(aura::client::kShowStateKey) !=
|
| + ui::SHOW_STATE_DEFAULT)
|
| return false;
|
|
|
| // Dragging a window moves the local coordinate frame, so do arithmetic
|
|
|