Index: ash/screen_ash.cc |
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc |
index efda02240d0849c533e6c4044d836a50d6bbb515..87bb461f99aa55c4e8fb647fd5add9e82a63dd48 100644 |
--- a/ash/screen_ash.cc |
+++ b/ash/screen_ash.cc |
@@ -40,7 +40,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) { |
// static |
gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) { |
sky
2012/10/01 14:11:48
Can't you nuke this entirely and folks instead use
|
if (window->GetRootWindow() == Shell::GetPrimaryRootWindow()) |
- return Shell::GetInstance()->shelf()->GetMaximizedWindowBounds(window); |
+ return Shell::GetInstance()->shelf()->GetWorkAreaBounds(window); |
else |
return GetDisplayBoundsInParent(window); |
} |
@@ -49,7 +49,7 @@ gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) { |
gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent( |
aura::Window* window) { |
if (window->GetRootWindow() == Shell::GetPrimaryRootWindow()) |
- return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window); |
+ return Shell::GetInstance()->shelf()->GetWorkAreaBounds(window); |
else |
return GetDisplayWorkAreaBoundsInParent(window); |
} |