| Index: ash/common/wm/wm_types.cc
|
| diff --git a/ash/common/wm/wm_types.cc b/ash/common/wm/wm_types.cc
|
| index 50337fb9dd141c7e92bc6f3dca2848bfdd9d716f..2e35f990b79da488eeb7a8ca988922b74c8b26bd 100644
|
| --- a/ash/common/wm/wm_types.cc
|
| +++ b/ash/common/wm/wm_types.cc
|
| @@ -38,6 +38,7 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) {
|
| return ui::SHOW_STATE_INACTIVE;
|
| case WINDOW_STATE_TYPE_FULLSCREEN:
|
| case WINDOW_STATE_TYPE_PINNED:
|
| + case WINDOW_STATE_TYPE_TRUSTED_PINNED:
|
| return ui::SHOW_STATE_FULLSCREEN;
|
| case WINDOW_STATE_TYPE_END:
|
| NOTREACHED();
|
| @@ -49,7 +50,8 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) {
|
| bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) {
|
| return type == WINDOW_STATE_TYPE_MAXIMIZED ||
|
| type == WINDOW_STATE_TYPE_FULLSCREEN ||
|
| - type == WINDOW_STATE_TYPE_PINNED;
|
| + type == WINDOW_STATE_TYPE_PINNED ||
|
| + type == WINDOW_STATE_TYPE_TRUSTED_PINNED;
|
| }
|
|
|
| } // namespace wm
|
|
|