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

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

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/common/window_resizer.cc ('k') | ash/wm/common/wm_screen_util.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/common/window_state.h" 5 #include "ash/wm/common/window_state.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/wm/common/default_state.h" 9 #include "ash/wm/common/default_state.h"
10 #include "ash/wm/common/window_positioning_utils.h" 10 #include "ash/wm/common/window_positioning_utils.h"
11 #include "ash/wm/common/window_state_delegate.h" 11 #include "ash/wm/common/window_state_delegate.h"
12 #include "ash/wm/common/window_state_observer.h" 12 #include "ash/wm/common/window_state_observer.h"
13 #include "ash/wm/common/wm_event.h" 13 #include "ash/wm/common/wm_event.h"
14 #include "ash/wm/common/wm_screen_util.h" 14 #include "ash/wm/common/wm_screen_util.h"
15 #include "ash/wm/common/wm_window.h" 15 #include "ash/wm/common/wm_window.h"
16 #include "base/auto_reset.h" 16 #include "base/auto_reset.h"
17 #include "ui/gfx/display.h"
18 #include "ui/gfx/screen.h"
19 17
20 namespace ash { 18 namespace ash {
21 namespace wm { 19 namespace wm {
22 20
23 namespace { 21 namespace {
24 22
25 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { 23 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) {
26 switch (requested_show_state) { 24 switch (requested_show_state) {
27 case ui::SHOW_STATE_DEFAULT: 25 case ui::SHOW_STATE_DEFAULT:
28 case ui::SHOW_STATE_NORMAL: 26 case ui::SHOW_STATE_NORMAL:
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (!window_->GetTargetVisibility()) { 384 if (!window_->GetTargetVisibility()) {
387 SetBoundsConstrained(new_bounds); 385 SetBoundsConstrained(new_bounds);
388 return; 386 return;
389 } 387 }
390 388
391 window_->SetBoundsDirectCrossFade(new_bounds); 389 window_->SetBoundsDirectCrossFade(new_bounds);
392 } 390 }
393 391
394 } // namespace wm 392 } // namespace wm
395 } // namespace ash 393 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/common/window_resizer.cc ('k') | ash/wm/common/wm_screen_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698