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" |
11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
12 #include "ash/wm/property_util.h" | 12 #include "ash/wm/property_util.h" |
13 #include "ash/wm/shelf_layout_manager.h" | 13 #include "ash/wm/shelf_layout_manager.h" |
14 #include "ui/app_list/app_list_constants.h" | 14 #include "ui/app_list/app_list_constants.h" |
15 #include "ui/app_list/app_list_view.h" | |
16 #include "ui/app_list/pagination_model.h" | 15 #include "ui/app_list/pagination_model.h" |
| 16 #include "ui/app_list/views/app_list_view.h" |
17 #include "ui/aura/client/focus_client.h" | 17 #include "ui/aura/client/focus_client.h" |
18 #include "ui/aura/root_window.h" | 18 #include "ui/aura/root_window.h" |
19 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
20 #include "ui/base/events/event.h" | 20 #include "ui/base/events/event.h" |
21 #include "ui/compositor/layer.h" | 21 #include "ui/compositor/layer.h" |
22 #include "ui/compositor/scoped_layer_animation_settings.h" | 22 #include "ui/compositor/scoped_layer_animation_settings.h" |
23 #include "ui/gfx/transform_util.h" | 23 #include "ui/gfx/transform_util.h" |
24 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
25 | 25 |
26 namespace ash { | 26 namespace ash { |
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 should_snap_back_ = false; | 340 should_snap_back_ = false; |
341 ui::ScopedLayerAnimationSettings animation(widget_animator); | 341 ui::ScopedLayerAnimationSettings animation(widget_animator); |
342 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( | 342 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( |
343 app_list::kOverscrollPageTransitionDurationMs)); | 343 app_list::kOverscrollPageTransitionDurationMs)); |
344 widget->SetBounds(view_bounds_); | 344 widget->SetBounds(view_bounds_); |
345 } | 345 } |
346 } | 346 } |
347 | 347 |
348 } // namespace internal | 348 } // namespace internal |
349 } // namespace ash | 349 } // namespace ash |
OLD | NEW |