ash: Reorder shutdown of ShelfLayoutManager and StatusAreaWidget

ash/shelf/shelf_tooltip_manager.cc

 // Copyright 2013 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/shelf/shelf_tooltip_manager.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
@@ skipping 83 matching lines @@
 
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
       root_window_(nullptr),
       shelf_layout_manager_(nullptr),
       bubble_(nullptr),
       weak_factory_(this) {}
 
 ShelfTooltipManager::~ShelfTooltipManager() {
-  WillDeleteShelf();
+  WillDeleteShelfLayoutManager();
 
   Shell::GetInstance()->RemovePointerWatcher(this);
 
   if (root_window_) {
     root_window_->RemoveObserver(this);
     root_window_->RemovePreTargetHandler(this);
     root_window_ = nullptr;
   }
 }
 
@@ skipping 104 matching lines @@
 }
 
 void ShelfTooltipManager::OnWindowDestroying(aura::Window* window) {
   if (window == root_window_) {
     root_window_->RemoveObserver(this);
     root_window_->RemovePreTargetHandler(this);
     root_window_ = nullptr;
   }
 }
 
-void ShelfTooltipManager::WillDeleteShelf() {
+void ShelfTooltipManager::WillDeleteShelfLayoutManager() {
   if (shelf_layout_manager_)
     shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
   shelf_view_ = nullptr;
 }
 
 void ShelfTooltipManager::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   if (new_state == SHELF_HIDDEN)
     Close();
 }
 
 void ShelfTooltipManager::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   if (new_state == SHELF_AUTO_HIDE_HIDDEN) {
     timer_.Stop();
     // AutoHide state change happens during an event filter, so immediate close
     // may cause a crash in the HandleMouseEvent() after the filter.  So we just
     // schedule the Close here.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 }  // namespace ash