Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2380)

Unified Diff: ash/launcher/launcher.cc

Issue 22429004: Refactor LauncherDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for OpenBrowserUsingShelfOnOhterDisplay fail Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/launcher/launcher.cc
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 008646de6d5ecd90aea574a36ed627f65d9906b5..49ac6e7d6d3fc917ee4cd16bcb494580017da0b7 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];
+ Shell::GetInstance()->launcher_item_delegate_manager()->
+ GetLauncherItemDelegate(item.type)->ItemSelected(item, event);
}
void Launcher::CycleWindowLinear(CycleDirection direction) {

Powered by Google App Engine
This is Rietveld 408576698