Simplify WorkAreaBounds access logic

ash/screen_ash.cc

Index: ash/screen_ash.cc
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index efda02240d0849c533e6c4044d836a50d6bbb515..16c892d215d323e4f1a279dde97926d49c16376f 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) {
   if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
-    return Shell::GetInstance()->shelf()->GetMaximizedWindowBounds(window);
+    return gfx::Screen::GetDisplayNearestWindow(window).work_area();

[oshima, 2012/10/15 04:45:04]

GetDisplayWorkAreaBoundsInParent(window)

   else
     return GetDisplayBoundsInParent(window);
 }
@@ -49,7 +49,7 @@ gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
 gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
     aura::Window* window) {

[oshima, 2012/10/15 04:45:04]

Remove this method and replace with GetDisplayWorkAreaBoundsInParent(window)

   if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
-    return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window);
+    return gfx::Screen::GetDisplayNearestWindow(window).work_area();
   else
     return GetDisplayWorkAreaBoundsInParent(window);
 }