OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/aura_shell/window_util.h" | 5 #include "ash/wm/window_util.h" |
6 | 6 |
7 #include "ash/wm/activation_controller.h" | 7 #include "ash/wm/activation_controller.h" |
| 8 #include "ash/wm/property_util.h" |
8 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
9 #include "ui/aura/client/aura_constants.h" | 10 #include "ui/aura/client/aura_constants.h" |
10 #include "ui/aura/root_window.h" | 11 #include "ui/aura/root_window.h" |
11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
12 #include "ui/aura_shell/property_util.h" | |
13 #include "ui/base/ui_base_types.h" | 13 #include "ui/base/ui_base_types.h" |
14 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
15 | 15 |
16 namespace aura_shell { | 16 namespace aura_shell { |
17 | 17 |
18 bool IsWindowMaximized(aura::Window* window) { | 18 bool IsWindowMaximized(aura::Window* window) { |
19 return window->GetIntProperty(aura::client::kShowStateKey) == | 19 return window->GetIntProperty(aura::client::kShowStateKey) == |
20 ui::SHOW_STATE_MAXIMIZED; | 20 ui::SHOW_STATE_MAXIMIZED; |
21 } | 21 } |
22 | 22 |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 SetRestoreBoundsIfNotSet(window); | 60 SetRestoreBoundsIfNotSet(window); |
61 window->SetBounds(gfx::Screen::GetMonitorAreaNearestWindow(window)); | 61 window->SetBounds(gfx::Screen::GetMonitorAreaNearestWindow(window)); |
62 break; | 62 break; |
63 | 63 |
64 default: | 64 default: |
65 break; | 65 break; |
66 } | 66 } |
67 } | 67 } |
68 | 68 |
69 } // namespace aura_shell | 69 } // namespace aura_shell |
OLD | NEW |