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 4c7e1db3f48c260bebbb97b0ba6e713e5c54e702..41053bd70a5acc49f77b35c71c6ac2898bab72e6 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,7 +41,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {
 
 // static
 gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
-  if (window->GetRootWindow() == Shell::GetPrimaryRootWindow())
+  if (GetRootWindowController(window->GetRootWindow())->launcher())
     return GetDisplayWorkAreaBoundsInParent(window);
   else
     return GetDisplayBoundsInParent(window);