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

Side by Side 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: 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 unified diff | Download patch
« no previous file with comments | « ash/shelf/shelf_widget.h ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/shelf/shelf_widget.h" 5 #include "ash/shelf/shelf_widget.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/focus_cycler.h" 8 #include "ash/focus_cycler.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/session/session_state_delegate.h" 10 #include "ash/session/session_state_delegate.h"
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 void ShelfWidget::DisableDimmingAnimationsForTest() { 796 void ShelfWidget::DisableDimmingAnimationsForTest() {
797 DCHECK(delegate_view_); 797 DCHECK(delegate_view_);
798 return delegate_view_->disable_dimming_animations_for_test(); 798 return delegate_view_->disable_dimming_animations_for_test();
799 } 799 }
800 800
801 void ShelfWidget::WillDeleteShelfLayoutManager() { 801 void ShelfWidget::WillDeleteShelfLayoutManager() {
802 shelf_layout_manager_->RemoveObserver(this); 802 shelf_layout_manager_->RemoveObserver(this);
803 shelf_layout_manager_ = NULL; 803 shelf_layout_manager_ = NULL;
804 } 804 }
805 805
806 void ShelfWidget::OnMouseEvent(ui::MouseEvent* event) {
807 Widget::OnMouseEvent(event);
808 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
809 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event);
810 }
811
812 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) {
813 Widget::OnGestureEvent(event);
814 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_)
815 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event);
816 }
817
806 } // namespace ash 818 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.h ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698