Refactor: Shelf Widget

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/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/fixed_sized_image_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_notifier.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"
 #include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/gfx/image/image.h"
@@ skipping 76 matching lines @@
  public:
   explicit UpdateNagger(SystemTrayItem* owner)
       : owner_(owner) {
     RestartTimer();
     owner_->system_tray()->GetWidget()->GetNativeView()->layer()->
         GetAnimator()->AddObserver(this);
   }
 
   virtual ~UpdateNagger() {
     internal::StatusAreaWidget* status_area =
-        Shell::GetPrimaryRootWindowController()->status_area_widget();
+        Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget();
     if (status_area) {
       status_area->system_tray()->GetWidget()->GetNativeView()->layer()->
           GetAnimator()->RemoveObserver(this);
     }
   }
 
   void RestartTimer() {
     timer_.Stop();
     timer_.Start(FROM_HERE,
                  base::TimeDelta::FromSeconds(kUpdateNaggingTimeSeconds),
@@ skipping 71 matching lines @@
   tray_view()->SetVisible(true);
   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