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/launcher/launcher_view.h" | 5 #include "ash/launcher/launcher_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 1223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 | 1234 |
1235 if (call_object_handler) { | 1235 if (call_object_handler) { |
1236 if (event.IsShiftDown()) | 1236 if (event.IsShiftDown()) |
1237 ui::LayerAnimator::set_slow_animation_mode(true); | 1237 ui::LayerAnimator::set_slow_animation_mode(true); |
1238 // The menu was not shown and the objects click handler should be called. | 1238 // The menu was not shown and the objects click handler should be called. |
1239 switch (model_->items()[view_index].type) { | 1239 switch (model_->items()[view_index].type) { |
1240 case TYPE_TABBED: | 1240 case TYPE_TABBED: |
1241 case TYPE_APP_PANEL: | 1241 case TYPE_APP_PANEL: |
1242 case TYPE_APP_SHORTCUT: | 1242 case TYPE_APP_SHORTCUT: |
1243 case TYPE_PLATFORM_APP: | 1243 case TYPE_PLATFORM_APP: |
1244 delegate_->ItemClicked(model_->items()[view_index], event.flags()); | 1244 delegate_->ItemClicked(model_->items()[view_index], event); |
1245 break; | 1245 break; |
1246 case TYPE_APP_LIST: | 1246 case TYPE_APP_LIST: |
1247 Shell::GetInstance()->ToggleAppList(GetWidget()->GetNativeView()); | 1247 Shell::GetInstance()->ToggleAppList(GetWidget()->GetNativeView()); |
1248 break; | 1248 break; |
1249 case TYPE_BROWSER_SHORTCUT: | 1249 case TYPE_BROWSER_SHORTCUT: |
1250 delegate_->OnBrowserShortcutClicked(event.flags()); | 1250 delegate_->OnBrowserShortcutClicked(event.flags()); |
1251 break; | 1251 break; |
1252 } | 1252 } |
1253 if (event.IsShiftDown()) | 1253 if (event.IsShiftDown()) |
1254 ui::LayerAnimator::set_slow_animation_mode(false); | 1254 ui::LayerAnimator::set_slow_animation_mode(false); |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1350 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 1350 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
1351 OnLauncherIconPositionsChanged()); | 1351 OnLauncherIconPositionsChanged()); |
1352 PreferredSizeChanged(); | 1352 PreferredSizeChanged(); |
1353 } | 1353 } |
1354 | 1354 |
1355 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 1355 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
1356 } | 1356 } |
1357 | 1357 |
1358 } // namespace internal | 1358 } // namespace internal |
1359 } // namespace ash | 1359 } // namespace ash |
OLD | NEW |