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

ash/system/tray_update.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/tray_update.h"
 
+#include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
@@ skipping 101 matching lines @@
   }
 
  private:
   void Nag() {
     owner_->PopupDetailedView(kShowUpdateNaggerForSeconds, false);
   }
 
   // Overridden from ui::LayerAnimationObserver.
   virtual void OnLayerAnimationEnded(
       ui::LayerAnimationSequence* sequence) OVERRIDE {
-    if (Shell::GetInstance()->shelf()->IsVisible())
+    // TODO(oshima): Find out if the updator will be shown on non
+    // primary display.
+    if (Shell::GetPrimaryRootWindowController()->shelf()->IsVisible())
       timer_.Stop();
     else if (!timer_.IsRunning())
       RestartTimer();
   }
 
   virtual void OnLayerAnimationAborted(
       ui::LayerAnimationSequence* sequence) OVERRIDE {}
 
   virtual void OnLayerAnimationScheduled(
       ui::LayerAnimationSequence* sequence) OVERRIDE {}
@@ skipping 34 matching lines @@
     // didn't click on it to restart. In either case, start the timer to show
     // the nag reminder again after the specified time.
     nagger_->RestartTimer();
   }
 }
 
 void TrayUpdate::OnUpdateRecommended(UpdateObserver::UpdateSeverity severity) {
   severity_ = severity;
   SetImageFromResourceId(DecideResource(severity_, false));
   tray_view()->SetVisible(true);
-  if (!Shell::GetInstance()->shelf()->IsVisible() && !nagger_.get()) {
+  if (!Shell::GetPrimaryRootWindowController()->shelf()->IsVisible() &&
+      !nagger_.get()) {
     // The shelf is not visible, and there is no nagger scheduled.
     nagger_.reset(new tray::UpdateNagger(this));
   }
 }
 
 }  // namespace internal
 }  // namespace ash