| Index: ash/accelerators/accelerator_controller_delegate_aura.cc
|
| diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| index 87294332ad582ed4943fac84b06fe6d4193386ad..8cce14cc6943498a3fc38241ccfbedafdffedb66 100644
|
| --- a/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| +++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
|
| @@ -223,8 +223,11 @@ void HandleTakeScreenshot(ScreenshotDelegate* screenshot_delegate) {
|
| }
|
|
|
| bool CanHandleUnpin() {
|
| + // Returns true only for WINDOW_STATE_TYPE_PINNED.
|
| + // WINDOW_STATE_TYPE_TRUSTED_PINNED does not accept user's unpin operation.
|
| wm::WindowState* window_state = wm::GetActiveWindowState();
|
| - return window_state && window_state->IsPinned();
|
| + return window_state &&
|
| + window_state->GetStateType() == wm::WINDOW_STATE_TYPE_PINNED;
|
| }
|
|
|
| #if defined(OS_CHROMEOS)
|
|
|