OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/workspace/maximized_workspace.h" | 5 #include "ash/wm/workspace/maximized_workspace.h" |
6 | 6 |
7 #include "ash/screen_ash.h" | 7 #include "ash/screen_ash.h" |
8 #include "ash/wm/property_util.h" | 8 #include "ash/wm/property_util.h" |
9 #include "ash/wm/window_util.h" | 9 #include "ash/wm/window_util.h" |
10 #include "ash/wm/workspace/workspace_manager.h" | 10 #include "ash/wm/workspace/workspace_manager.h" |
(...skipping 23 matching lines...) Expand all Loading... |
34 aura::Window* after) { | 34 aura::Window* after) { |
35 ResetWindowBounds(window); | 35 ResetWindowBounds(window); |
36 } | 36 } |
37 | 37 |
38 void MaximizedWorkspace::OnWindowRemoved(aura::Window* window) { | 38 void MaximizedWorkspace::OnWindowRemoved(aura::Window* window) { |
39 } | 39 } |
40 | 40 |
41 void MaximizedWorkspace::ResetWindowBounds(aura::Window* window) { | 41 void MaximizedWorkspace::ResetWindowBounds(aura::Window* window) { |
42 if (wm::IsWindowFullscreen(window)) { | 42 if (wm::IsWindowFullscreen(window)) { |
43 SetWindowBounds(window, | 43 SetWindowBounds(window, |
44 ScreenAsh::GetDisplayParentBounds(window)); | 44 ScreenAsh::GetDisplayBoundsInParent(window)); |
45 } else { | 45 } else { |
46 SetWindowBounds(window, | 46 SetWindowBounds(window, |
47 ScreenAsh::GetMaximizedWindowParentBounds(window)); | 47 ScreenAsh::GetMaximizedWindowBoundsInParent(window)); |
48 } | 48 } |
49 } | 49 } |
50 | 50 |
51 } // namespace internal | 51 } // namespace internal |
52 } // namespace ash | 52 } // namespace ash |
OLD | NEW |