OLD | NEW |
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" | |
8 #include "ash/aura/wm_shelf_aura.h" | 7 #include "ash/aura/wm_shelf_aura.h" |
9 #include "ash/aura/wm_window_aura.h" | 8 #include "ash/aura/wm_window_aura.h" |
| 9 #include "ash/common/ash_switches.h" |
10 #include "ash/common/focus_cycler.h" | 10 #include "ash/common/focus_cycler.h" |
11 #include "ash/common/material_design/material_design_controller.h" | 11 #include "ash/common/material_design/material_design_controller.h" |
12 #include "ash/common/session/session_state_delegate.h" | 12 #include "ash/common/session/session_state_delegate.h" |
13 #include "ash/common/shelf/shelf_constants.h" | 13 #include "ash/common/shelf/shelf_constants.h" |
14 #include "ash/common/shelf/shelf_model.h" | 14 #include "ash/common/shelf/shelf_model.h" |
15 #include "ash/common/shelf/wm_shelf_util.h" | 15 #include "ash/common/shelf/wm_shelf_util.h" |
16 #include "ash/common/shell_window_ids.h" | 16 #include "ash/common/shell_window_ids.h" |
17 #include "ash/common/system/tray/system_tray_delegate.h" | 17 #include "ash/common/system/tray/system_tray_delegate.h" |
18 #include "ash/common/wm_root_window_controller.h" | 18 #include "ash/common/wm_root_window_controller.h" |
19 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
822 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event); | 822 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event); |
823 } | 823 } |
824 | 824 |
825 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) { | 825 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) { |
826 Widget::OnGestureEvent(event); | 826 Widget::OnGestureEvent(event); |
827 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_) | 827 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_) |
828 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event); | 828 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event); |
829 } | 829 } |
830 | 830 |
831 } // namespace ash | 831 } // namespace ash |
OLD | NEW |