| Index: ui/app_list/views/app_list_item_view.cc
|
| diff --git a/ui/app_list/views/app_list_item_view.cc b/ui/app_list/views/app_list_item_view.cc
|
| index 2d51c41b4496f7ed8c9f4027540fd70085e06703..ac78f2d38186b73aba23c5b4468eec515a1267ef 100644
|
| --- a/ui/app_list/views/app_list_item_view.cc
|
| +++ b/ui/app_list/views/app_list_item_view.cc
|
| @@ -49,11 +49,6 @@ const int kFolderPreviewRadius = 40;
|
|
|
| const int kLeftRightPaddingChars = 1;
|
|
|
| -#if !defined(OS_WIN)
|
| -// Scale to transform the icon when a drag starts.
|
| -const float kDraggingIconScale = 1.5f;
|
| -#endif
|
| -
|
| // Delay in milliseconds of when the dragging UI should be shown for mouse drag.
|
| const int kMouseDragUIDelayInMs = 200;
|
|
|
| @@ -161,23 +156,6 @@ void AppListItemView::SetUIState(UIState ui_state) {
|
| case UI_STATE_DROPPING_IN_FOLDER:
|
| break;
|
| }
|
| -#if !defined(OS_WIN)
|
| - ui::ScopedLayerAnimationSettings settings(layer()->GetAnimator());
|
| - switch (ui_state_) {
|
| - case UI_STATE_NORMAL:
|
| - layer()->SetTransform(gfx::Transform());
|
| - break;
|
| - case UI_STATE_DRAGGING: {
|
| - const gfx::Rect bounds(layer()->bounds().size());
|
| - layer()->SetTransform(gfx::GetScaleTransform(
|
| - bounds.CenterPoint(),
|
| - kDraggingIconScale));
|
| - break;
|
| - }
|
| - case UI_STATE_DROPPING_IN_FOLDER:
|
| - break;
|
| - }
|
| -#endif // !OS_WIN
|
|
|
| SetTitleSubpixelAA();
|
| SchedulePaint();
|
| @@ -409,16 +387,6 @@ void AppListItemView::OnMouseReleased(const ui::MouseEvent& event) {
|
| apps_grid_view_->EndDrag(false);
|
| }
|
|
|
| -void AppListItemView::OnMouseCaptureLost() {
|
| - // We don't cancel the dag on mouse capture lost for windows as entering a
|
| - // synchronous drag causes mouse capture to be lost and pressing escape
|
| - // dismisses the app list anyway.
|
| -#if !defined(OS_WIN)
|
| - CustomButton::OnMouseCaptureLost();
|
| - apps_grid_view_->EndDrag(true);
|
| -#endif
|
| -}
|
| -
|
| bool AppListItemView::OnMouseDragged(const ui::MouseEvent& event) {
|
| CustomButton::OnMouseDragged(event);
|
| if (apps_grid_view_->IsDraggedView(this)) {
|
|
|