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

ash/wm/status_area_layout_manager.cc

Index: ash/wm/status_area_layout_manager.cc
diff --git a/ash/wm/status_area_layout_manager.cc b/ash/wm/status_area_layout_manager.cc
index 84b4aa3824e735506f9072a36e0abe00c781ff59..b971d7911b262be966c845ab14494262920f8829 100644
--- a/ash/wm/status_area_layout_manager.cc
+++ b/ash/wm/status_area_layout_manager.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/status_area_layout_manager.h"
 
+#include "ash/system/status_area_widget.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/auto_reset.h"
 #include "ui/aura/window.h"
@@ -49,7 +50,7 @@ void StatusAreaLayoutManager::SetChildBounds(
     const gfx::Rect& requested_bounds) {
   // Only need to have the shelf do a layout if the child changing is the status
   // area and the shelf isn't in the process of doing a layout.
-  if (child != shelf_->status()->GetNativeView() || in_layout_) {
+  if (child != shelf_->status_area_widget()->GetNativeView() || in_layout_) {
     SetChildBoundsDirect(child, requested_bounds);
     return;
   }