| 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 | 278 |
| 279 void AppListController::OnWidgetClosing(views::Widget* widget) { | 279 void AppListController::OnWidgetClosing(views::Widget* widget) { |
| 280 DCHECK(view_->GetWidget() == widget); | 280 DCHECK(view_->GetWidget() == widget); |
| 281 if (is_visible_) | 281 if (is_visible_) |
| 282 SetVisible(false, widget->GetNativeView()); | 282 SetVisible(false, widget->GetNativeView()); |
| 283 ResetView(); | 283 ResetView(); |
| 284 } | 284 } |
| 285 | 285 |
| 286 //////////////////////////////////////////////////////////////////////////////// | 286 //////////////////////////////////////////////////////////////////////////////// |
| 287 // AppListController, ShellObserver implementation: | 287 // AppListController, ShellObserver implementation: |
| 288 void AppListController::OnShelfAlignmentChanged() { | 288 void AppListController::OnShelfAlignmentChanged(aura::RootWindow* root_window) { |
| 289 if (view_) { | 289 if (view_) { |
| 290 view_->SetBubbleArrowLocation(GetBubbleArrowLocation( | 290 view_->SetBubbleArrowLocation(GetBubbleArrowLocation( |
| 291 view_->GetWidget()->GetNativeView())); | 291 view_->GetWidget()->GetNativeView())); |
| 292 } | 292 } |
| 293 } | 293 } |
| 294 | 294 |
| 295 //////////////////////////////////////////////////////////////////////////////// | 295 //////////////////////////////////////////////////////////////////////////////// |
| 296 // AppListController, LauncherIconObserver implementation: | 296 // AppListController, LauncherIconObserver implementation: |
| 297 | 297 |
| 298 void AppListController::OnLauncherIconPositionsChanged() { | 298 void AppListController::OnLauncherIconPositionsChanged() { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 should_snap_back_ = false; | 341 should_snap_back_ = false; |
| 342 ui::ScopedLayerAnimationSettings animation(widget_animator); | 342 ui::ScopedLayerAnimationSettings animation(widget_animator); |
| 343 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( | 343 animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds( |
| 344 app_list::kOverscrollPageTransitionDurationMs)); | 344 app_list::kOverscrollPageTransitionDurationMs)); |
| 345 widget->SetBounds(view_bounds_); | 345 widget->SetBounds(view_bounds_); |
| 346 } | 346 } |
| 347 } | 347 } |
| 348 | 348 |
| 349 } // namespace internal | 349 } // namespace internal |
| 350 } // namespace ash | 350 } // namespace ash |
| OLD | NEW |