| Index: ash/wm/wm_types.cc
|
| diff --git a/ash/wm/wm_types.cc b/ash/wm/wm_types.cc
|
| index 643520c36dd0262d04c0094083b5f493359b1999..2077bd2a99e4a82f89a35584d50c6a3f72724a92 100644
|
| --- a/ash/wm/wm_types.cc
|
| +++ b/ash/wm/wm_types.cc
|
| @@ -27,10 +27,11 @@ ui::WindowShowState ToWindowShowState(WindowStateType type) {
|
| case WINDOW_STATE_TYPE_RIGHT_SNAPPED:
|
| case WINDOW_STATE_TYPE_LEFT_SNAPPED:
|
| case WINDOW_STATE_TYPE_AUTO_POSITIONED:
|
| - case WINDOW_STATE_TYPE_DOCKED:
|
| return ui::SHOW_STATE_NORMAL;
|
| - case WINDOW_STATE_TYPE_MINIMIZED:
|
| + case WINDOW_STATE_TYPE_DOCKED:
|
| case WINDOW_STATE_TYPE_DOCKED_MINIMIZED:
|
| + return ui::SHOW_STATE_DOCKED;
|
| + case WINDOW_STATE_TYPE_MINIMIZED:
|
| return ui::SHOW_STATE_MINIMIZED;
|
| case WINDOW_STATE_TYPE_MAXIMIZED:
|
| return ui::SHOW_STATE_MAXIMIZED;
|
|
|