Chromium Code Reviews| Index: ash/launcher/launcher.cc |
| diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc |
| index 008646de6d5ecd90aea574a36ed627f65d9906b5..4af51438c6727be57da43c4c9935c891eeb92c8d 100644 |
| --- a/ash/launcher/launcher.cc |
| +++ b/ash/launcher/launcher.cc |
| @@ -9,6 +9,8 @@ |
| #include "ash/focus_cycler.h" |
| #include "ash/launcher/launcher_delegate.h" |
| +#include "ash/launcher/launcher_item_delegate.h" |
| +#include "ash/launcher/launcher_item_delegate_manager.h" |
| #include "ash/launcher/launcher_model.h" |
| #include "ash/launcher/launcher_navigator.h" |
| #include "ash/launcher/launcher_view.h" |
| @@ -106,9 +108,9 @@ void Launcher::ActivateLauncherItem(int index) { |
| ui::EF_NONE, |
| false); |
| - const ash::LauncherItems& items = |
| - launcher_view_->model()->items(); |
| - delegate_->ItemSelected(items[index], event); |
| + const ash::LauncherItem item = launcher_view_->model()->items()[index]; |
|
sky
2013/08/27 00:03:47
const ash::LauncherItem&
simonhong_
2013/08/27 01:05:29
Done.
|
| + Shell::GetInstance()->launcher_item_delegate_manager()-> |
| + GetLauncherItemDelegate(item.type)->ItemSelected(item, event); |
| } |
| void Launcher::CycleWindowLinear(CycleDirection direction) { |