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

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

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/wm/window_positioner.cc ('k') | ash/wm/window_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/window_state.h" 5 #include "ash/wm/window_state.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/screen_util.h" 9 #include "ash/screen_util.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/wm/default_state.h" 11 #include "ash/wm/default_state.h"
12 #include "ash/wm/window_animations.h" 12 #include "ash/wm/window_animations.h"
13 #include "ash/wm/window_properties.h" 13 #include "ash/wm/window_properties.h"
14 #include "ash/wm/window_state_delegate.h" 14 #include "ash/wm/window_state_delegate.h"
15 #include "ash/wm/window_state_observer.h" 15 #include "ash/wm/window_state_observer.h"
16 #include "ash/wm/window_util.h" 16 #include "ash/wm/window_util.h"
17 #include "ash/wm/wm_event.h" 17 #include "ash/wm/wm_event.h"
18 #include "base/auto_reset.h" 18 #include "base/auto_reset.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "ui/aura/client/aura_constants.h" 20 #include "ui/aura/client/aura_constants.h"
21 #include "ui/aura/layout_manager.h" 21 #include "ui/aura/layout_manager.h"
22 #include "ui/aura/window.h" 22 #include "ui/aura/window.h"
23 #include "ui/aura/window_delegate.h" 23 #include "ui/aura/window_delegate.h"
24 #include "ui/compositor/layer_tree_owner.h" 24 #include "ui/compositor/layer_tree_owner.h"
25 #include "ui/compositor/scoped_layer_animation_settings.h" 25 #include "ui/compositor/scoped_layer_animation_settings.h"
26 #include "ui/gfx/display.h" 26 #include "ui/gfx/display.h"
27 #include "ui/views/corewm/window_util.h" 27 #include "ui/wm/core/window_util.h"
28 28
29 namespace ash { 29 namespace ash {
30 namespace wm { 30 namespace wm {
31 31
32 namespace { 32 namespace {
33 33
34 // A tentative class to set the bounds on the window. 34 // A tentative class to set the bounds on the window.
35 // TODO(oshima): Once all logic is cleaned up, move this to the real layout 35 // TODO(oshima): Once all logic is cleaned up, move this to the real layout
36 // manager with proper friendship. 36 // manager with proper friendship.
37 class BoundsSetter : public aura::LayoutManager { 37 class BoundsSetter : public aura::LayoutManager {
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
425 } 425 }
426 return settings; 426 return settings;
427 } 427 }
428 428
429 const WindowState* GetWindowState(const aura::Window* window) { 429 const WindowState* GetWindowState(const aura::Window* window) {
430 return GetWindowState(const_cast<aura::Window*>(window)); 430 return GetWindowState(const_cast<aura::Window*>(window));
431 } 431 }
432 432
433 } // namespace wm 433 } // namespace wm
434 } // namespace ash 434 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/window_positioner.cc ('k') | ash/wm/window_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698