| 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" |
| 11 #include "ash/launcher/launcher_delegate.h" | 11 #include "ash/launcher/launcher_delegate.h" |
| 12 #include "ash/launcher/launcher_icon_observer.h" | 12 #include "ash/launcher/launcher_icon_observer.h" |
| 13 #include "ash/launcher/launcher_model.h" | 13 #include "ash/launcher/launcher_model.h" |
| 14 #include "ash/launcher/launcher_tooltip_manager.h" | 14 #include "ash/launcher/launcher_tooltip_manager.h" |
| 15 #include "ash/launcher/overflow_bubble.h" | 15 #include "ash/launcher/overflow_bubble.h" |
| 16 #include "ash/launcher/overflow_button.h" | 16 #include "ash/launcher/overflow_button.h" |
| 17 #include "ash/launcher/tabbed_launcher_button.h" | 17 #include "ash/launcher/tabbed_launcher_button.h" |
| 18 #include "ash/shell.h" | 18 #include "ash/shell.h" |
| 19 #include "ash/shell_delegate.h" | 19 #include "ash/shell_delegate.h" |
| 20 #include "base/auto_reset.h" | 20 #include "base/auto_reset.h" |
| 21 #include "base/memory/scoped_ptr.h" | 21 #include "base/memory/scoped_ptr.h" |
| 22 #include "grit/ash_strings.h" | 22 #include "grit/ash_strings.h" |
| 23 #include "grit/ui_resources.h" | 23 #include "grit/ash_resources.h" |
| 24 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
| 25 #include "ui/base/models/simple_menu_model.h" | 25 #include "ui/base/models/simple_menu_model.h" |
| 26 #include "ui/base/resource/resource_bundle.h" | 26 #include "ui/base/resource/resource_bundle.h" |
| 27 #include "ui/compositor/layer.h" | 27 #include "ui/compositor/layer.h" |
| 28 #include "ui/compositor/layer_animator.h" | 28 #include "ui/compositor/layer_animator.h" |
| 29 #include "ui/gfx/canvas.h" | 29 #include "ui/gfx/canvas.h" |
| 30 #include "ui/views/animation/bounds_animator.h" | 30 #include "ui/views/animation/bounds_animator.h" |
| 31 #include "ui/views/border.h" | 31 #include "ui/views/border.h" |
| 32 #include "ui/views/controls/menu/menu_model_adapter.h" | 32 #include "ui/views/controls/menu/menu_model_adapter.h" |
| 33 #include "ui/views/controls/menu/menu_runner.h" | 33 #include "ui/views/controls/menu/menu_runner.h" |
| (...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 1065 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
| 1066 OnLauncherIconPositionsChanged()); | 1066 OnLauncherIconPositionsChanged()); |
| 1067 PreferredSizeChanged(); | 1067 PreferredSizeChanged(); |
| 1068 } | 1068 } |
| 1069 | 1069 |
| 1070 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 1070 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
| 1071 } | 1071 } |
| 1072 | 1072 |
| 1073 } // namespace internal | 1073 } // namespace internal |
| 1074 } // namespace ash | 1074 } // namespace ash |
| OLD | NEW |