Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: ash/wm/lock_window_state.cc

Issue 2051343002: Make various gfx classes more amenable to use as compile-time constants. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Compile and test fixes Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 30
31 LockWindowState::LockWindowState(aura::Window* window) 31 LockWindowState::LockWindowState(aura::Window* window)
32 : current_state_type_(wm::GetWindowState(window)->GetStateType()) { 32 : current_state_type_(wm::GetWindowState(window)->GetStateType()) {
33 } 33 }
34 34
35 LockWindowState::~LockWindowState() { 35 LockWindowState::~LockWindowState() {
36 } 36 }
37 37
38 void LockWindowState::OnWMEvent(wm::WindowState* window_state, 38 void LockWindowState::OnWMEvent(wm::WindowState* window_state,
39 const wm::WMEvent* event) { 39 const wm::WMEvent* event) {
40 aura::Window* window =
41 ash::WmWindowAura::GetAuraWindow(window_state->window());
42 gfx::Rect bounds = window->bounds();
43
44 switch (event->type()) { 40 switch (event->type()) {
45 case wm::WM_EVENT_TOGGLE_FULLSCREEN: 41 case wm::WM_EVENT_TOGGLE_FULLSCREEN:
46 ToggleFullScreen(window_state, window_state->delegate()); 42 ToggleFullScreen(window_state, window_state->delegate());
47 break; 43 break;
48 case wm::WM_EVENT_FULLSCREEN: 44 case wm::WM_EVENT_FULLSCREEN:
49 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN); 45 UpdateWindow(window_state, wm::WINDOW_STATE_TYPE_FULLSCREEN);
50 break; 46 break;
51 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION: 47 case wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION:
52 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE: 48 case wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE:
53 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE: 49 case wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE:
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot( 195 gfx::Rect bounds = ScreenUtil::GetShelfDisplayBoundsInRoot(
200 ash::WmWindowAura::GetAuraWindow(window_state->window())); 196 ash::WmWindowAura::GetAuraWindow(window_state->window()));
201 197
202 bounds.set_height(bounds.height() - keyboard_bounds.height()); 198 bounds.set_height(bounds.height() - keyboard_bounds.height());
203 199
204 VLOG(1) << "Updating window bounds to: " << bounds.ToString(); 200 VLOG(1) << "Updating window bounds to: " << bounds.ToString();
205 window_state->SetBoundsDirect(bounds); 201 window_state->SetBoundsDirect(bounds);
206 } 202 }
207 203
208 } // namespace ash 204 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698