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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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_resizer.cc ('k') | ash/wm/window_state_aura.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/common/wm_window.h"
9 #include "ash/wm/default_state.h" 10 #include "ash/wm/default_state.h"
10 #include "ash/wm/window_positioning_utils.h" 11 #include "ash/wm/window_positioning_utils.h"
11 #include "ash/wm/window_state_delegate.h" 12 #include "ash/wm/window_state_delegate.h"
12 #include "ash/wm/window_state_observer.h" 13 #include "ash/wm/window_state_observer.h"
13 #include "ash/wm/wm_event.h" 14 #include "ash/wm/wm_event.h"
14 #include "ash/wm/wm_screen_util.h" 15 #include "ash/wm/wm_screen_util.h"
15 #include "ash/wm_window.h"
16 #include "base/auto_reset.h" 16 #include "base/auto_reset.h"
17 17
18 namespace ash { 18 namespace ash {
19 namespace wm { 19 namespace wm {
20 20
21 namespace { 21 namespace {
22 22
23 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { 23 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) {
24 switch (requested_show_state) { 24 switch (requested_show_state) {
25 case ui::SHOW_STATE_DEFAULT: 25 case ui::SHOW_STATE_DEFAULT:
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 if (!window_->GetTargetVisibility()) { 392 if (!window_->GetTargetVisibility()) {
393 SetBoundsConstrained(new_bounds); 393 SetBoundsConstrained(new_bounds);
394 return; 394 return;
395 } 395 }
396 396
397 window_->SetBoundsDirectCrossFade(new_bounds); 397 window_->SetBoundsDirectCrossFade(new_bounds);
398 } 398 }
399 399
400 } // namespace wm 400 } // namespace wm
401 } // namespace ash 401 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_resizer.cc ('k') | ash/wm/window_state_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698