mash: Move AutoHideEventHandler to WmShelfAura.

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/shelf.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.
+class WmShelfAura::AutoHideEventHandler : public ui::EventHandler {
+ public:
+  explicit AutoHideEventHandler(ShelfLayoutManager* shelf_layout_manager)
+      : shelf_layout_manager_(shelf_layout_manager) {
+    Shell::GetInstance()->AddPreTargetHandler(this);
+  }
+  ~AutoHideEventHandler() override {
+    Shell::GetInstance()->RemovePreTargetHandler(this);
+  }
+
+  // Overridden from ui::EventHandler:
+  void OnMouseEvent(ui::MouseEvent* event) override {
+    shelf_layout_manager_->UpdateAutoHideForMouseEvent(
+        event, WmWindowAura::Get(static_cast<aura::Window*>(event->target())));
+  }
+  void OnGestureEvent(ui::GestureEvent* event) override {
+    shelf_layout_manager_->UpdateAutoHideForGestureEvent(
+        event, WmWindowAura::Get(static_cast<aura::Window*>(event->target())));
+  }
+
+ private:
+  ShelfLayoutManager* shelf_layout_manager_;
+  DISALLOW_COPY_AND_ASSIGN(AutoHideEventHandler);
+};
+
+// WmShelfAura -----------------------------------------------------------------
+
 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);
 }
@@ skipping 14 matching lines @@
 }
 
 // static
 Shelf* WmShelfAura::GetShelf(WmShelf* shelf) {
   return static_cast<WmShelfAura*>(shelf)->shelf_;
 }
 
 void WmShelfAura::ResetShelfLayoutManager() {
   if (!shelf_layout_manager_)
     return;
+  auto_hide_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 72 matching lines @@
       WmWindowAura::GetAuraWindow(window));
 }
 
 bool WmShelfAura::ProcessGestureEvent(const ui::GestureEvent& event) {
   // Can be called at login screen.
   if (!shelf_layout_manager_)
     return false;
   return shelf_layout_manager_->ProcessGestureEvent(event);
 }
 
-void WmShelfAura::UpdateAutoHideForMouseEvent(ui::MouseEvent* event) {
-  // Auto-hide support for ash_sysui.
-  if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
-    shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
-}
-
-void WmShelfAura::UpdateAutoHideForGestureEvent(ui::GestureEvent* event) {
-  // Auto-hide support for ash_sysui.
-  if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
-    shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
-}
-
 void WmShelfAura::AddObserver(WmShelfObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmShelfAura::RemoveObserver(WmShelfObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void WmShelfAura::SetKeyboardBoundsForTesting(const gfx::Rect& bounds) {
   shelf_layout_manager_->OnKeyboardBoundsChanging(bounds);
@@ skipping 16 matching lines @@
     BackgroundAnimatorChangeType change_type) {
   if (background_type == GetBackgroundType())
     return;
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundTypeChanged(background_type, change_type));
 }
 
 void WmShelfAura::WillChangeVisibilityState(ShelfVisibilityState new_state) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     WillChangeVisibilityState(new_state));
+
+  if (new_state != SHELF_AUTO_HIDE) {
+    auto_hide_event_handler_.reset();
+  } else if (!auto_hide_event_handler_) {
+    auto_hide_event_handler_.reset(
+        new AutoHideEventHandler(shelf_layout_manager_));
+  }
 }
 
 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