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 "ui/aura_shell/window_util.h" |
6 | 6 |
7 #include "ui/aura/client/activation_client.h" | 7 #include "ui/aura/client/activation_client.h" |
8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
9 #include "ui/aura/root_window.h" | 9 #include "ui/aura/root_window.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/aura_shell/activation_controller.h" | 11 #include "ui/aura_shell/activation_controller.h" |
12 #include "ui/aura_shell/property_util.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::kShowStateKey) == | 19 return window->GetIntProperty(aura::client::kShowStateKey) == |
20 ui::SHOW_STATE_MAXIMIZED; | 20 ui::SHOW_STATE_MAXIMIZED; |
21 } | 21 } |
22 | 22 |
23 void ActivateWindow(aura::Window* window) { | 23 void ActivateWindow(aura::Window* window) { |
24 aura::client::GetActivationClient()->ActivateWindow(window); | 24 aura::client::GetActivationClient()->ActivateWindow(window); |
25 } | 25 } |
26 | 26 |
27 void DeactivateWindow(aura::Window* window) { | 27 void DeactivateWindow(aura::Window* window) { |
28 aura::client::GetActivationClient()->DeactivateWindow(window); | 28 aura::client::GetActivationClient()->DeactivateWindow(window); |
29 } | 29 } |
30 | 30 |
31 bool IsActiveWindow(aura::Window* window) { | 31 bool IsActiveWindow(aura::Window* window) { |
32 return GetActiveWindow() == window; | 32 return GetActiveWindow() == window; |
33 } | 33 } |
34 | 34 |
35 aura::Window* GetActiveWindow() { | 35 aura::Window* GetActiveWindow() { |
36 return aura::client::GetActivationClient()->GetActiveWindow(); | 36 return aura::client::GetActivationClient()->GetActiveWindow(); |
37 } | 37 } |
38 | 38 |
39 aura::Window* GetActivatableWindow(aura::Window* window) { | 39 aura::Window* GetActivatableWindow(aura::Window* window) { |
40 return internal::ActivationController::GetActivatableWindow(window); | 40 return internal::ActivationController::GetActivatableWindow(window); |
41 } | 41 } |
42 | 42 |
43 void UpdateBoundsFromShowState(aura::Window* window) { | 43 void UpdateBoundsFromShowState(aura::Window* window) { |
44 switch (window->GetIntProperty(aura::kShowStateKey)) { | 44 switch (window->GetIntProperty(aura::client::kShowStateKey)) { |
45 case ui::SHOW_STATE_NORMAL: { | 45 case ui::SHOW_STATE_NORMAL: { |
46 const gfx::Rect* restore = GetRestoreBounds(window); | 46 const gfx::Rect* restore = GetRestoreBounds(window); |
47 window->SetProperty(aura::kRestoreBoundsKey, NULL); | 47 window->SetProperty(aura::client::kRestoreBoundsKey, NULL); |
48 if (restore) | 48 if (restore) |
49 window->SetBounds(*restore); | 49 window->SetBounds(*restore); |
50 delete restore; | 50 delete restore; |
51 break; | 51 break; |
52 } | 52 } |
53 | 53 |
54 case ui::SHOW_STATE_MAXIMIZED: | 54 case ui::SHOW_STATE_MAXIMIZED: |
55 SetRestoreBoundsIfNotSet(window); | 55 SetRestoreBoundsIfNotSet(window); |
56 window->SetBounds(gfx::Screen::GetMonitorWorkAreaNearestWindow(window)); | 56 window->SetBounds(gfx::Screen::GetMonitorWorkAreaNearestWindow(window)); |
57 break; | 57 break; |
58 | 58 |
59 case ui::SHOW_STATE_FULLSCREEN: | 59 case ui::SHOW_STATE_FULLSCREEN: |
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 |