| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/lock_window_state.h" | 5 #include "ash/wm/lock_window_state.h" |
| 6 | 6 |
| 7 #include "ash/screen_util.h" | 7 #include "ash/screen_util.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/lock_layout_manager.h" | 9 #include "ash/wm/lock_layout_manager.h" |
| 10 #include "ash/wm/window_animations.h" | 10 #include "ash/wm/window_animations.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 case wm::WM_EVENT_TOGGLE_FULLSCREEN: | 38 case wm::WM_EVENT_TOGGLE_FULLSCREEN: |
| 39 ToggleFullScreen(window_state, window_state->delegate()); | 39 ToggleFullScreen(window_state, window_state->delegate()); |
| 40 break; | 40 break; |
| 41 case wm::WM_EVENT_FULLSCREEN: | 41 case wm::WM_EVENT_FULLSCREEN: |
| 42 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN); | 42 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN); |
| 43 break; | 43 break; |
| 44 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION: | 44 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION: |
| 45 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE: | 45 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE: |
| 46 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE: | 46 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE: |
| 47 case wm::WM_EVENT_TOGGLE_MAXIMIZE: | 47 case wm::WM_EVENT_TOGGLE_MAXIMIZE: |
| 48 case wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT: |
| 49 case wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT: |
| 48 case wm::WM_EVENT_CENTER: | 50 case wm::WM_EVENT_CENTER: |
| 49 case wm::WM_EVENT_SNAP_LEFT: | 51 case wm::WM_EVENT_SNAP_LEFT: |
| 50 case wm::WM_EVENT_SNAP_RIGHT: | 52 case wm::WM_EVENT_SNAP_RIGHT: |
| 51 case wm::WM_EVENT_NORMAL: | 53 case wm::WM_EVENT_NORMAL: |
| 52 case wm::WM_EVENT_MAXIMIZE: | 54 case wm::WM_EVENT_MAXIMIZE: |
| 53 case wm::WM_EVENT_DOCK: | 55 case wm::WM_EVENT_DOCK: |
| 54 UpdateWindow(window_state, | 56 UpdateWindow(window_state, |
| 55 GetMaximizedOrCenteredWindowType(window_state)); | 57 GetMaximizedOrCenteredWindowType(window_state)); |
| 56 return; | 58 return; |
| 57 case wm::WM_EVENT_MINIMIZE: | 59 case wm::WM_EVENT_MINIMIZE: |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 | 178 |
| 177 gfx::Rect bounds = | 179 gfx::Rect bounds = |
| 178 ScreenUtil::GetDisplayBoundsInParent(window_state->window()); | 180 ScreenUtil::GetDisplayBoundsInParent(window_state->window()); |
| 179 bounds.set_height(bounds.height() - keyboard_bounds.height()); | 181 bounds.set_height(bounds.height() - keyboard_bounds.height()); |
| 180 | 182 |
| 181 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); | 183 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); |
| 182 window_state->SetBoundsDirect(bounds); | 184 window_state->SetBoundsDirect(bounds); |
| 183 } | 185 } |
| 184 | 186 |
| 185 } // namespace ash | 187 } // namespace ash |
| OLD | NEW |