| 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/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/launcher/launcher.h" | 8 #include "ash/launcher/launcher.h" |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/screen_ash.h" | 10 #include "ash/screen_ash.h" |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 } | 368 } |
| 369 | 369 |
| 370 //////////////////////////////////////////////////////////////////////////////// | 370 //////////////////////////////////////////////////////////////////////////////// |
| 371 // AppListController, ShellObserver implementation: | 371 // AppListController, ShellObserver implementation: |
| 372 void AppListController::OnShelfAlignmentChanged(aura::Window* root_window) { | 372 void AppListController::OnShelfAlignmentChanged(aura::Window* root_window) { |
| 373 if (view_) | 373 if (view_) |
| 374 view_->SetBubbleArrow(GetBubbleArrow(view_->GetWidget()->GetNativeView())); | 374 view_->SetBubbleArrow(GetBubbleArrow(view_->GetWidget()->GetNativeView())); |
| 375 } | 375 } |
| 376 | 376 |
| 377 //////////////////////////////////////////////////////////////////////////////// | 377 //////////////////////////////////////////////////////////////////////////////// |
| 378 // AppListController, LauncherIconObserver implementation: | 378 // AppListController, ShelfIconObserver implementation: |
| 379 | 379 |
| 380 void AppListController::OnLauncherIconPositionsChanged() { | 380 void AppListController::OnShelfIconPositionsChanged() { |
| 381 UpdateBounds(); | 381 UpdateBounds(); |
| 382 } | 382 } |
| 383 | 383 |
| 384 //////////////////////////////////////////////////////////////////////////////// | 384 //////////////////////////////////////////////////////////////////////////////// |
| 385 // AppListController, PaginationModelObserver implementation: | 385 // AppListController, PaginationModelObserver implementation: |
| 386 | 386 |
| 387 void AppListController::TotalPagesChanged() { | 387 void AppListController::TotalPagesChanged() { |
| 388 } | 388 } |
| 389 | 389 |
| 390 void AppListController::SelectedPageChanged(int old_selected, | 390 void AppListController::SelectedPageChanged(int old_selected, |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 should_snap_back_ = false; | 426 should_snap_back_ = false; |
| 427 ui::ScopedLayerAnimationSettings animation(widget_animator); | 427 ui::ScopedLayerAnimationSettings animation(widget_animator); |
| 428 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( | 428 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( |
| 429 app_list::kOverscrollPageTransitionDurationMs)); | 429 app_list::kOverscrollPageTransitionDurationMs)); |
| 430 widget->SetBounds(view_bounds_); | 430 widget->SetBounds(view_bounds_); |
| 431 } | 431 } |
| 432 } | 432 } |
| 433 | 433 |
| 434 } // namespace internal | 434 } // namespace internal |
| 435 } // namespace ash | 435 } // namespace ash |
| OLD | NEW |