Remove Shell::shelf()|status_area_widget()|launcher()

ash/screen_ash.cc

Index: ash/screen_ash.cc
diff --git a/ash/screen_ash.cc b/ash/screen_ash.cc
index 8a5a08913e774dc6a36ff2ed1852515392c1bbfa..6be5b08ed9b2ef4053072233baea980e0f18f2da 100644
--- a/ash/screen_ash.cc
+++ b/ash/screen_ash.cc
@@ -6,7 +6,9 @@
 
 #include "ash/display/display_controller.h"
 #include "ash/display/multi_display_manager.h"
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
+#include "ash/wm/property_util.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/logging.h"
@@ -39,8 +41,8 @@ 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);
+  if (GetRootWindowController(window->GetRootWindow())->launcher())
+    return GetDisplayWorkAreaBoundsInParent(window);
   else
     return GetDisplayBoundsInParent(window);
 }
@@ -48,10 +50,7 @@ gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
 // static
 gfx::Rect ScreenAsh::GetUnmaximizedWorkAreaBoundsInParent(
     aura::Window* window) {
-  if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
-    return Shell::GetInstance()->shelf()->GetUnmaximizedWorkAreaBounds(window);
-  else
-    return GetDisplayWorkAreaBoundsInParent(window);
+  return GetDisplayWorkAreaBoundsInParent(window);
 }
 
 // static