ash: Reorder shutdown of ShelfLayoutManager and StatusAreaWidget

ash/shelf/shelf_widget.h

 // 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.
 
 #ifndef ASH_SHELF_SHELF_WIDGET_H_
 #define ASH_SHELF_SHELF_WIDGET_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 57 matching lines @@
   // Sets the focus cycler.  Also adds the shelf to the cycle.
   void SetFocusCycler(FocusCycler* focus_cycler);
   FocusCycler* GetFocusCycler();
 
   // Called by the activation delegate, before the shelf is activated
   // when no other windows are visible.
   void WillActivateAsFallback() { activating_as_fallback_ = true; }
 
   aura::Window* window_container() { return window_container_; }
 
-  // TODO(harrym): Remove when Status Area Widget is a child view.
-  void ShutdownStatusAreaWidget();
+  // Clean up prior to deletion.
+  void Shutdown();
 
   // Force the shelf to be presented in an undimmed state.
   void ForceUndimming(bool force);
 
   // Overridden from views::WidgetObserver:
   void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
 
   // A function to test the current alpha used by the dimming bar. If there is
   // no dimmer active, the function will return -1.
   int GetDimmingAlphaForTest();
 
   // A function to test the bounds of the dimming bar. Returns gfx::Rect() if
   // the dimmer is inactive.
   gfx::Rect GetDimmerBoundsForTest();
 
   // Disable dimming animations for running tests.
   void DisableDimmingAnimationsForTest();
 
   // ShelfLayoutManagerObserver overrides:
-  void WillDeleteShelf() override;
+  void WillDeleteShelfLayoutManager() override;
 
  private:
   class DelegateView;
 
+  // Owned by the shelf container's aura::Window.
   ShelfLayoutManager* shelf_layout_manager_;
   std::unique_ptr<Shelf> shelf_;
   StatusAreaWidget* status_area_widget_;
 
   // delegate_view_ is attached to window_container_ and is cleaned up
   // during CloseChildWindows of the associated RootWindowController.
   DelegateView* delegate_view_;
   BackgroundAnimator background_animator_;
   bool activating_as_fallback_;
   aura::Window* window_container_;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_WIDGET_H_