Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2227143003: mash: Move AutoHideEventHandler to WmShelfAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shelf/shelf_widget.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index f582e8bd34a37e51d6fd067f7f524a67d57e9c36..53c207951cf68c872a6dc3277a64f055f1750db4 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -22,7 +22,6 @@
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_window_targeter.h"
-#include "ash/shell.h"
James Cook 2016/08/09 19:47:58 Hooray!
msw 2016/08/09 19:52:58 Acknowledged.
#include "ash/wm/status_area_layout_manager.h"
#include "ash/wm/workspace_controller.h"
#include "base/memory/ptr_util.h"
@@ -526,16 +525,4 @@ void ShelfWidget::WillDeleteShelfLayoutManager() {
shelf_layout_manager_ = nullptr;
}
-void ShelfWidget::OnMouseEvent(ui::MouseEvent* event) {
- Widget::OnMouseEvent(event);
- if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
- shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
-}
-
-void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) {
- Widget::OnGestureEvent(event);
- if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
- shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
-}
-
} // namespace ash
« ash/shelf/shelf_layout_manager.cc ('K') | « ash/shelf/shelf_widget.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698