mash: Migrate some misc ShelfLayoutManager deps to ash common.

ash/aura/wm_shelf_aura.cc

 // Copyright 2016 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/aura/wm_shelf_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/dimmer_view.h"
 #include "ash/shelf/shelf.h"
+#include "ash/shelf/shelf_bezel_event_handler.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 // WmShelfAura::AutoHideEventHandler -------------------------------------------
 
 // Forwards mouse and gesture events to ShelfLayoutManager for auto-hide.
 // TODO(mash): Add similar event handling support for mash.
@@ skipping 26 matching lines @@
 
 WmShelfAura::WmShelfAura() {}
 
 WmShelfAura::~WmShelfAura() {}
 
 void WmShelfAura::SetShelfLayoutManager(
     ShelfLayoutManager* shelf_layout_manager) {
   DCHECK(!shelf_layout_manager_);
   shelf_layout_manager_ = shelf_layout_manager;
   shelf_layout_manager_->AddObserver(this);
+  bezel_event_handler_.reset(new ShelfBezelEventHandler(this));
 }
 
 void WmShelfAura::SetShelf(Shelf* shelf) {
   DCHECK(!shelf_);
   shelf_ = shelf;
   shelf_->AddIconObserver(this);
 }
 
 void WmShelfAura::Shutdown() {
   if (shelf_) {
     shelf_->RemoveIconObserver(this);
     shelf_ = nullptr;
   }
 
   ResetShelfLayoutManager();
 }
 
 // static
 Shelf* WmShelfAura::GetShelf(WmShelf* shelf) {
   return static_cast<WmShelfAura*>(shelf)->shelf_;
 }
 
 void WmShelfAura::ResetShelfLayoutManager() {
   if (!shelf_layout_manager_)
     return;
+  // Clear event handlers that might otherwise forward events during shutdown.
   auto_hide_event_handler_.reset();
+  bezel_event_handler_.reset();
   shelf_layout_manager_->RemoveObserver(this);
   shelf_layout_manager_ = nullptr;
 }
 
 WmWindow* WmShelfAura::GetWindow() {
   // Use |shelf_layout_manager_| to access ShelfWidget because it is set
   // before |shelf_| is available.
   return WmWindowAura::Get(
       shelf_layout_manager_->shelf_widget()->GetNativeView());
 }
@@ skipping 131 matching lines @@
 void WmShelfAura::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnAutoHideStateChanged(new_state));
 }
 
 void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
 }  // namespace ash