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 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 } | 224 } |
225 | 225 |
226 void AppListController::UpdateBounds() { | 226 void AppListController::UpdateBounds() { |
227 if (view_ && is_visible_) | 227 if (view_ && is_visible_) |
228 view_->UpdateBounds(); | 228 view_->UpdateBounds(); |
229 } | 229 } |
230 | 230 |
231 //////////////////////////////////////////////////////////////////////////////// | 231 //////////////////////////////////////////////////////////////////////////////// |
232 // AppListController, aura::EventFilter implementation: | 232 // AppListController, aura::EventFilter implementation: |
233 | 233 |
234 ui::EventResult AppListController::OnMouseEvent(ui::MouseEvent* event) { | 234 void AppListController::OnMouseEvent(ui::MouseEvent* event) { |
235 if (event->type() == ui::ET_MOUSE_PRESSED) | 235 if (event->type() == ui::ET_MOUSE_PRESSED) |
236 ProcessLocatedEvent(event); | 236 ProcessLocatedEvent(event); |
237 return ui::ER_UNHANDLED; | |
238 } | 237 } |
239 | 238 |
240 void AppListController::OnGestureEvent(ui::GestureEvent* event) { | 239 void AppListController::OnGestureEvent(ui::GestureEvent* event) { |
241 if (event->type() == ui::ET_GESTURE_TAP) | 240 if (event->type() == ui::ET_GESTURE_TAP) |
242 ProcessLocatedEvent(event); | 241 ProcessLocatedEvent(event); |
243 } | 242 } |
244 | 243 |
245 //////////////////////////////////////////////////////////////////////////////// | 244 //////////////////////////////////////////////////////////////////////////////// |
246 // AppListController, aura::FocusObserver implementation: | 245 // AppListController, aura::FocusObserver implementation: |
247 | 246 |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
341 should_snap_back_ = false; | 340 should_snap_back_ = false; |
342 ui::ScopedLayerAnimationSettings animation(widget_animator); | 341 ui::ScopedLayerAnimationSettings animation(widget_animator); |
343 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( | 342 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( |
344 app_list::kOverscrollPageTransitionDurationMs)); | 343 app_list::kOverscrollPageTransitionDurationMs)); |
345 widget->SetBounds(view_bounds_); | 344 widget->SetBounds(view_bounds_); |
346 } | 345 } |
347 } | 346 } |
348 | 347 |
349 } // namespace internal | 348 } // namespace internal |
350 } // namespace ash | 349 } // namespace ash |
OLD | NEW |