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" |
11 #include "ash/launcher/app_list_button.h" | 11 #include "ash/launcher/app_list_button.h" |
12 #include "ash/launcher/launcher_button.h" | 12 #include "ash/launcher/launcher_button.h" |
13 #include "ash/launcher/launcher_delegate.h" | 13 #include "ash/launcher/launcher_delegate.h" |
14 #include "ash/launcher/launcher_icon_observer.h" | 14 #include "ash/launcher/launcher_icon_observer.h" |
15 #include "ash/launcher/launcher_model.h" | 15 #include "ash/launcher/launcher_model.h" |
16 #include "ash/launcher/launcher_tooltip_manager.h" | 16 #include "ash/launcher/launcher_tooltip_manager.h" |
17 #include "ash/launcher/overflow_bubble.h" | 17 #include "ash/launcher/overflow_bubble.h" |
18 #include "ash/launcher/overflow_button.h" | 18 #include "ash/launcher/overflow_button.h" |
19 #include "ash/launcher/tabbed_launcher_button.h" | 19 #include "ash/launcher/tabbed_launcher_button.h" |
20 #include "ash/root_window_controller.h" | 20 #include "ash/root_window_controller.h" |
| 21 #include "ash/shelf/shelf_layout_manager.h" |
| 22 #include "ash/shelf/shelf_widget.h" |
21 #include "ash/shell_delegate.h" | 23 #include "ash/shell_delegate.h" |
22 #include "ash/wm/shelf_layout_manager.h" | |
23 #include "base/auto_reset.h" | 24 #include "base/auto_reset.h" |
24 #include "base/memory/scoped_ptr.h" | 25 #include "base/memory/scoped_ptr.h" |
25 #include "grit/ash_resources.h" | 26 #include "grit/ash_resources.h" |
26 #include "grit/ash_strings.h" | 27 #include "grit/ash_strings.h" |
27 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
28 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
29 #include "ui/base/models/simple_menu_model.h" | 30 #include "ui/base/models/simple_menu_model.h" |
30 #include "ui/base/resource/resource_bundle.h" | 31 #include "ui/base/resource/resource_bundle.h" |
31 #include "ui/compositor/layer.h" | 32 #include "ui/compositor/layer.h" |
32 #include "ui/compositor/layer_animator.h" | 33 #include "ui/compositor/layer_animator.h" |
(...skipping 1353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1386 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, | 1387 FOR_EACH_OBSERVER(LauncherIconObserver, observers_, |
1387 OnLauncherIconPositionsChanged()); | 1388 OnLauncherIconPositionsChanged()); |
1388 PreferredSizeChanged(); | 1389 PreferredSizeChanged(); |
1389 } | 1390 } |
1390 | 1391 |
1391 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { | 1392 void LauncherView::OnBoundsAnimatorDone(views::BoundsAnimator* animator) { |
1392 } | 1393 } |
1393 | 1394 |
1394 } // namespace internal | 1395 } // namespace internal |
1395 } // namespace ash | 1396 } // namespace ash |
OLD | NEW |