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 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 return false; | 253 return false; |
254 } | 254 } |
255 | 255 |
256 bool AppListController::PreHandleMouseEvent(aura::Window* target, | 256 bool AppListController::PreHandleMouseEvent(aura::Window* target, |
257 ui::MouseEvent* event) { | 257 ui::MouseEvent* event) { |
258 if (event->type() == ui::ET_MOUSE_PRESSED) | 258 if (event->type() == ui::ET_MOUSE_PRESSED) |
259 ProcessLocatedEvent(target, *event); | 259 ProcessLocatedEvent(target, *event); |
260 return false; | 260 return false; |
261 } | 261 } |
262 | 262 |
263 ui::TouchStatus AppListController::PreHandleTouchEvent( | 263 ui::EventResult AppListController::PreHandleTouchEvent( |
264 aura::Window* target, | 264 aura::Window* target, |
265 ui::TouchEvent* event) { | 265 ui::TouchEvent* event) { |
266 return ui::TOUCH_STATUS_UNKNOWN; | 266 return ui::ER_UNHANDLED; |
267 } | 267 } |
268 | 268 |
269 ui::EventResult AppListController::PreHandleGestureEvent( | 269 ui::EventResult AppListController::PreHandleGestureEvent( |
270 aura::Window* target, | 270 aura::Window* target, |
271 ui::GestureEvent* event) { | 271 ui::GestureEvent* event) { |
272 if (event->type() == ui::ET_GESTURE_TAP) | 272 if (event->type() == ui::ET_GESTURE_TAP) |
273 ProcessLocatedEvent(target, *event); | 273 ProcessLocatedEvent(target, *event); |
274 return ui::ER_UNHANDLED; | 274 return ui::ER_UNHANDLED; |
275 } | 275 } |
276 | 276 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 should_snap_back_ = false; | 369 should_snap_back_ = false; |
370 ui::ScopedLayerAnimationSettings animation(GetLayer(widget)->GetAnimator()); | 370 ui::ScopedLayerAnimationSettings animation(GetLayer(widget)->GetAnimator()); |
371 animation.SetTransitionDuration( | 371 animation.SetTransitionDuration( |
372 base::TimeDelta::FromMilliseconds(kSnapBackAnimationDurationMs)); | 372 base::TimeDelta::FromMilliseconds(kSnapBackAnimationDurationMs)); |
373 widget->SetBounds(view_bounds_); | 373 widget->SetBounds(view_bounds_); |
374 } | 374 } |
375 } | 375 } |
376 | 376 |
377 } // namespace internal | 377 } // namespace internal |
378 } // namespace ash | 378 } // namespace ash |
OLD | NEW |