| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/aura/wm_window_aura.h" | 9 #include "ash/aura/wm_window_aura.h" |
| 10 #include "ash/common/wm/window_animation_types.h" | 10 #include "ash/common/wm/window_animation_types.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 void LockWindowState::OnWMEvent(wm::WindowState* window_state, | 37 void LockWindowState::OnWMEvent(wm::WindowState* window_state, |
| 38 const wm::WMEvent* event) { | 38 const wm::WMEvent* event) { |
| 39 switch (event->type()) { | 39 switch (event->type()) { |
| 40 case wm::WM_EVENT_TOGGLE_FULLSCREEN: | 40 case wm::WM_EVENT_TOGGLE_FULLSCREEN: |
| 41 ToggleFullScreen(window_state, window_state->delegate()); | 41 ToggleFullScreen(window_state, window_state->delegate()); |
| 42 break; | 42 break; |
| 43 case wm::WM_EVENT_FULLSCREEN: | 43 case wm::WM_EVENT_FULLSCREEN: |
| 44 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN); | 44 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN); |
| 45 break; | 45 break; |
| 46 case wm::WM_EVENT_PIN: | 46 case wm::WM_EVENT_PIN: |
| 47 case wm::WM_EVENT_TRUSTED_PIN: |
| 47 NOTREACHED(); | 48 NOTREACHED(); |
| 48 break; | 49 break; |
| 49 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION: | 50 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION: |
| 50 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE: | 51 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE: |
| 51 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE: | 52 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE: |
| 52 case wm::WM_EVENT_TOGGLE_MAXIMIZE: | 53 case wm::WM_EVENT_TOGGLE_MAXIMIZE: |
| 53 case wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT: | 54 case wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT: |
| 54 case wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT: | 55 case wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT: |
| 55 case wm::WM_EVENT_CENTER: | 56 case wm::WM_EVENT_CENTER: |
| 56 case wm::WM_EVENT_SNAP_LEFT: | 57 case wm::WM_EVENT_SNAP_LEFT: |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); | 188 keyboard_bounds = keyboard_controller->current_keyboard_bounds(); |
| 188 } | 189 } |
| 189 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); | 190 gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window()); |
| 190 bounds.set_height(bounds.height() - keyboard_bounds.height()); | 191 bounds.set_height(bounds.height() - keyboard_bounds.height()); |
| 191 | 192 |
| 192 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); | 193 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); |
| 193 window_state->SetBoundsDirect(bounds); | 194 window_state->SetBoundsDirect(bounds); |
| 194 } | 195 } |
| 195 | 196 |
| 196 } // namespace ash | 197 } // namespace ash |
| OLD | NEW |