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

Unified Diff: ash/system/status_area_widget.cc

Issue 2007003002: mash: Preliminary support for shelf auto-hide (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shutdown
Patch Set: rebase 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
« no previous file with comments | « ash/system/status_area_widget.h ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 6c8d46814bd956ee22af5f606061b8d983a88804..054a2bfb03f917a8b4cbdd615fb3fde442925032 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -133,6 +133,18 @@ void StatusAreaWidget::OnNativeWidgetActivationChanged(bool active) {
status_area_widget_delegate_->SetPaneFocusAndFocusDefault();
}
+void StatusAreaWidget::OnMouseEvent(ui::MouseEvent* event) {
+ Widget::OnMouseEvent(event);
+ if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
+ shelf_widget_->shelf_layout_manager()->UpdateAutoHideForMouseEvent(event);
+}
+
+void StatusAreaWidget::OnGestureEvent(ui::GestureEvent* event) {
+ Widget::OnGestureEvent(event);
+ if (Shell::GetInstance()->in_mus() && shelf_widget_->shelf_layout_manager())
+ shelf_widget_->shelf_layout_manager()->UpdateAutoHideForGestureEvent(event);
+}
+
void StatusAreaWidget::AddSystemTray() {
system_tray_ = new SystemTray(this);
status_area_widget_delegate_->AddTray(system_tray_);
« no previous file with comments | « ash/system/status_area_widget.h ('k') | ash/test/test_shelf_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698