Index: ash/common/wm/default_state.cc |
diff --git a/ash/common/wm/default_state.cc b/ash/common/wm/default_state.cc |
index d17253e6a9187f68018c7fd5e483d8015509fa50..56dc1cd245120658c471f92924b7a38714639abe 100644 |
--- a/ash/common/wm/default_state.cc |
+++ b/ash/common/wm/default_state.cc |
@@ -164,6 +164,10 @@ DefaultState::DefaultState(WindowStateType initial_state_type) |
DefaultState::~DefaultState() {} |
void DefaultState::OnWMEvent(WindowState* window_state, const WMEvent* event) { |
+ // Do not change the PINNED window state if this is not unpin event. |
+ if (window_state->IsTrustedPinned() && event->type() != WM_EVENT_NORMAL) |
+ return; |
oshima
2016/12/21 21:18:23
move this after workspace events because you still
hidehiko
2016/12/22 16:57:57
Done. Added test in ash/wm/window_state_unittest.c
|
+ |
if (ProcessWorkspaceEvents(window_state, event)) |
return; |