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

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

Issue 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build Created 4 years, 8 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
« no previous file with comments | « ash/wm/window_state.h ('k') | ash/wm/workspace/workspace_event_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/window_state.h" 5 #include "ash/wm/window_state.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/ash_switches.h"
10 #include "ash/root_window_controller.h"
11 #include "ash/screen_util.h"
12 #include "ash/shell_window_ids.h"
13 #include "ash/wm/common/window_positioning_utils.h" 9 #include "ash/wm/common/window_positioning_utils.h"
14 #include "ash/wm/common/wm_event.h" 10 #include "ash/wm/common/wm_event.h"
15 #include "ash/wm/common/wm_screen_util.h" 11 #include "ash/wm/common/wm_screen_util.h"
12 #include "ash/wm/common/wm_window.h"
16 #include "ash/wm/default_state.h" 13 #include "ash/wm/default_state.h"
17 #include "ash/wm/window_state_delegate.h" 14 #include "ash/wm/window_state_delegate.h"
18 #include "ash/wm/window_state_observer.h" 15 #include "ash/wm/window_state_observer.h"
19 #include "ash/wm/window_util.h"
20 #include "base/auto_reset.h" 16 #include "base/auto_reset.h"
21 #include "ui/aura/client/aura_constants.h"
22 #include "ui/gfx/display.h" 17 #include "ui/gfx/display.h"
23 #include "ui/gfx/screen.h" 18 #include "ui/gfx/screen.h"
24 19
25 namespace ash { 20 namespace ash {
26 namespace wm { 21 namespace wm {
27 22
28 namespace { 23 namespace {
29 24
30 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { 25 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) {
31 switch (requested_show_state) { 26 switch (requested_show_state) {
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 if (!window_->GetTargetVisibility()) { 389 if (!window_->GetTargetVisibility()) {
395 SetBoundsConstrained(new_bounds); 390 SetBoundsConstrained(new_bounds);
396 return; 391 return;
397 } 392 }
398 393
399 window_->SetBoundsDirectCrossFade(new_bounds); 394 window_->SetBoundsDirectCrossFade(new_bounds);
400 } 395 }
401 396
402 } // namespace wm 397 } // namespace wm
403 } // namespace ash 398 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_state.h ('k') | ash/wm/workspace/workspace_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698