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

ash/system/status_area_widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/status_area_widget.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 333 matching lines @@
   delete system_tray_;
   system_tray_ = NULL;
 }
 
 bool StatusAreaWidget::ShouldShowLauncher() const {
   if ((system_tray_ && system_tray_->HasSystemBubble()) ||
       (web_notification_tray_ &&
        web_notification_tray_->IsMessageCenterBubbleVisible()))
     return true;
 
-  if (!Shell::GetInstance()->shelf()->IsVisible())
+  if (!RootWindowController::ForLauncher(GetNativeView())->shelf()->IsVisible())
     return false;
 
   // If the launcher is currently visible, don't hide the launcher if the mouse
   // is in any of the notification bubbles.
   return (system_tray_ && system_tray_->IsMouseInNotificationBubble()) ||
         (web_notification_tray_ &&
          web_notification_tray_->IsMouseInNotificationBubble());
 }
 
 bool StatusAreaWidget::IsMessageBubbleShown() const {
@@ skipping 57 matching lines @@
     return;
   login_status_ = login_status;
   if (system_tray_)
     system_tray_->UpdateAfterLoginStatusChange(login_status);
   if (web_notification_tray_)
     web_notification_tray_->UpdateAfterLoginStatusChange(login_status);
 }
 
 }  // namespace internal
 }  // namespace ash