| 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/launcher/app_list_button.h" | 9 #include "ash/launcher/app_list_button.h" |
| 10 #include "ash/launcher/launcher_button.h" | 10 #include "ash/launcher/launcher_button.h" |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 | 741 |
| 742 if (is_horizontal_alignment()) { | 742 if (is_horizontal_alignment()) { |
| 743 return gfx::Size(last_button_bounds.right() + leading_inset(), | 743 return gfx::Size(last_button_bounds.right() + leading_inset(), |
| 744 kLauncherPreferredSize); | 744 kLauncherPreferredSize); |
| 745 } | 745 } |
| 746 | 746 |
| 747 return gfx::Size(kLauncherPreferredSize, | 747 return gfx::Size(kLauncherPreferredSize, |
| 748 last_button_bounds.bottom() + leading_inset()); | 748 last_button_bounds.bottom() + leading_inset()); |
| 749 } | 749 } |
| 750 | 750 |
| 751 ui::GestureStatus LauncherView::OnGestureEvent(const ui::GestureEvent& event) { | 751 ui::EventResult LauncherView::OnGestureEvent(const ui::GestureEvent& event) { |
| 752 return gesture_handler_.ProcessGestureEvent(event) ? | 752 return gesture_handler_.ProcessGestureEvent(event) ? |
| 753 ui::GESTURE_STATUS_CONSUMED : ui::GESTURE_STATUS_UNKNOWN; | 753 ui::ER_CONSUMED : ui::ER_UNHANDLED; |
| 754 } | 754 } |
| 755 | 755 |
| 756 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) { | 756 void LauncherView::OnBoundsChanged(const gfx::Rect& previous_bounds) { |
| 757 LayoutToIdealBounds(); | 757 LayoutToIdealBounds(); |
| 758 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 758 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
| 759 OnLauncherIconPositionsChanged()); | 759 OnLauncherIconPositionsChanged()); |
| 760 | 760 |
| 761 if (IsShowingOverflowBubble()) | 761 if (IsShowingOverflowBubble()) |
| 762 overflow_bubble_->Hide(); | 762 overflow_bubble_->Hide(); |
| 763 } | 763 } |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1062 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 1062 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
| 1063 OnLauncherIconPositionsChanged()); | 1063 OnLauncherIconPositionsChanged()); |
| 1064 PreferredSizeChanged(); | 1064 PreferredSizeChanged(); |
| 1065 } | 1065 } |
| 1066 | 1066 |
| 1067 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 1067 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
| 1068 } | 1068 } |
| 1069 | 1069 |
| 1070 } // namespace internal | 1070 } // namespace internal |
| 1071 } // namespace ash | 1071 } // namespace ash |
| OLD | NEW |