| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/wm/app_list_controller.h" | 5 #include "ash/wm/app_list_controller.h" |
| 6 | 6 |
| 7 #include "ash/launcher/launcher.h" | 7 #include "ash/launcher/launcher.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_delegate.h" | 10 #include "ash/shell_delegate.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 246 } |
| 247 | 247 |
| 248 ui::TouchStatus AppListController::PreHandleTouchEvent( | 248 ui::TouchStatus AppListController::PreHandleTouchEvent( |
| 249 aura::Window* target, | 249 aura::Window* target, |
| 250 ui::TouchEvent* event) { | 250 ui::TouchEvent* event) { |
| 251 return ui::TOUCH_STATUS_UNKNOWN; | 251 return ui::TOUCH_STATUS_UNKNOWN; |
| 252 } | 252 } |
| 253 | 253 |
| 254 ui::GestureStatus AppListController::PreHandleGestureEvent( | 254 ui::GestureStatus AppListController::PreHandleGestureEvent( |
| 255 aura::Window* target, | 255 aura::Window* target, |
| 256 ui::GestureEventImpl* event) { | 256 ui::GestureEvent* event) { |
| 257 if (event->type() == ui::ET_GESTURE_TAP) | 257 if (event->type() == ui::ET_GESTURE_TAP) |
| 258 ProcessLocatedEvent(target, *event); | 258 ProcessLocatedEvent(target, *event); |
| 259 return ui::GESTURE_STATUS_UNKNOWN; | 259 return ui::GESTURE_STATUS_UNKNOWN; |
| 260 } | 260 } |
| 261 | 261 |
| 262 //////////////////////////////////////////////////////////////////////////////// | 262 //////////////////////////////////////////////////////////////////////////////// |
| 263 // AppListController, aura::FocusObserver implementation: | 263 // AppListController, aura::FocusObserver implementation: |
| 264 void AppListController::OnWindowFocused(aura::Window* window) { | 264 void AppListController::OnWindowFocused(aura::Window* window) { |
| 265 if (view_ && is_visible_) { | 265 if (view_ && is_visible_) { |
| 266 aura::Window* applist_container = Shell::GetContainer( | 266 aura::Window* applist_container = Shell::GetContainer( |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 | 307 |
| 308 //////////////////////////////////////////////////////////////////////////////// | 308 //////////////////////////////////////////////////////////////////////////////// |
| 309 // AppListController, LauncherIconObserver implementation: | 309 // AppListController, LauncherIconObserver implementation: |
| 310 | 310 |
| 311 void AppListController::OnLauncherIconPositionsChanged() { | 311 void AppListController::OnLauncherIconPositionsChanged() { |
| 312 UpdateBounds(); | 312 UpdateBounds(); |
| 313 } | 313 } |
| 314 | 314 |
| 315 } // namespace internal | 315 } // namespace internal |
| 316 } // namespace ash | 316 } // namespace ash |
| OLD | NEW |