| 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" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/common/shell_window_ids.h" |
| 8 #include "ash/common/wm/shelf/wm_shelf_constants.h" | 9 #include "ash/common/wm/shelf/wm_shelf_constants.h" |
| 9 #include "ash/common/wm/shelf/wm_shelf_util.h" | 10 #include "ash/common/wm/shelf/wm_shelf_util.h" |
| 10 #include "ash/common/wm/wm_root_window_controller.h" | 11 #include "ash/common/wm/wm_root_window_controller.h" |
| 11 #include "ash/focus_cycler.h" | 12 #include "ash/focus_cycler.h" |
| 12 #include "ash/session/session_state_delegate.h" | 13 #include "ash/session/session_state_delegate.h" |
| 13 #include "ash/shelf/shelf_constants.h" | 14 #include "ash/shelf/shelf_constants.h" |
| 14 #include "ash/shelf/shelf_delegate.h" | 15 #include "ash/shelf/shelf_delegate.h" |
| 15 #include "ash/shelf/shelf_layout_manager.h" | 16 #include "ash/shelf/shelf_layout_manager.h" |
| 16 #include "ash/shelf/shelf_model.h" | 17 #include "ash/shelf/shelf_model.h" |
| 17 #include "ash/shelf/shelf_navigator.h" | 18 #include "ash/shelf/shelf_navigator.h" |
| 18 #include "ash/shelf/shelf_util.h" | 19 #include "ash/shelf/shelf_util.h" |
| 19 #include "ash/shelf/shelf_view.h" | 20 #include "ash/shelf/shelf_view.h" |
| 20 #include "ash/shelf/shelf_widget.h" | 21 #include "ash/shelf/shelf_widget.h" |
| 21 #include "ash/shell.h" | 22 #include "ash/shell.h" |
| 22 #include "ash/shell_window_ids.h" | |
| 23 #include "ash/system/tray/system_tray_delegate.h" | 23 #include "ash/system/tray/system_tray_delegate.h" |
| 24 #include "ash/wm/aura/wm_window_aura.h" | 24 #include "ash/wm/aura/wm_window_aura.h" |
| 25 #include "ash/wm/status_area_layout_manager.h" | 25 #include "ash/wm/status_area_layout_manager.h" |
| 26 #include "ash/wm/window_properties.h" | 26 #include "ash/wm/window_properties.h" |
| 27 #include "ash/wm/workspace_controller.h" | 27 #include "ash/wm/workspace_controller.h" |
| 28 #include "grit/ash_resources.h" | 28 #include "grit/ash_resources.h" |
| 29 #include "ui/aura/window.h" | 29 #include "ui/aura/window.h" |
| 30 #include "ui/aura/window_event_dispatcher.h" | 30 #include "ui/aura/window_event_dispatcher.h" |
| 31 #include "ui/aura/window_observer.h" | 31 #include "ui/aura/window_observer.h" |
| 32 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 813 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event); | 813 shelf_layout_manager_->UpdateAutoHideForMouseEvent(event); |
| 814 } | 814 } |
| 815 | 815 |
| 816 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) { | 816 void ShelfWidget::OnGestureEvent(ui::GestureEvent* event) { |
| 817 Widget::OnGestureEvent(event); | 817 Widget::OnGestureEvent(event); |
| 818 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_) | 818 if (Shell::GetInstance()->in_mus() && shelf_layout_manager_) |
| 819 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event); | 819 shelf_layout_manager_->UpdateAutoHideForGestureEvent(event); |
| 820 } | 820 } |
| 821 | 821 |
| 822 } // namespace ash | 822 } // namespace ash |
| OLD | NEW |