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

Unified Diff: ash/shelf/shelf_widget.cc

Issue 2007003002: mash: Preliminary support for shelf auto-hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shutdown
Patch Set: cleanup Created 4 years, 7 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
Index: ash/shelf/shelf_widget.cc
diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index 601cecdfc73ed72ca7806716a6b4508f651afc02..3b04c957802a7e70ed1a68eadedd0c6fdf4afed7 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -794,6 +794,18 @@ void ShelfWidget::DisableDimmingAnimationsForTest() {
return delegate_view_->disable_dimming_animations_for_test();
}
+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);
+}
+
void ShelfWidget::WillDeleteShelf() {
shelf_layout_manager_->RemoveObserver(this);
shelf_layout_manager_ = NULL;

Powered by Google App Engine
This is Rietveld 408576698