| Index: ash/wm/maximize_mode/maximize_mode_window_state.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc
|
| index 6d6259e55052b5e145c601602ef2eac84d6d9120..e0b0a9f69509fe8b81b15222317365e8c97d3600 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
|
| @@ -130,7 +130,8 @@ void MaximizeModeWindowState::OnWMEvent(wm::WindowState* window_state,
|
| UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN, true);
|
| break;
|
| case wm::WM_EVENT_PIN:
|
| - UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_PINNED, true);
|
| + if (!WmShell::Get()->IsPinned())
|
| + UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_PINNED, true);
|
| break;
|
| case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
|
| case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE:
|
| @@ -281,7 +282,7 @@ void MaximizeModeWindowState::UpdateWindow(wm::WindowState* window_state,
|
|
|
| if (old_state_type == wm::WINDOW_STATE_TYPE_PINNED ||
|
| target_state == wm::WINDOW_STATE_TYPE_PINNED) {
|
| - WmShell::Get()->NotifyPinnedStateChanged(window_state->window());
|
| + WmShell::Get()->SetPinnedWindow(window_state->window());
|
| }
|
|
|
| if ((window_state->window()->GetTargetVisibility() ||
|
|
|