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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/launcher/launcher.cc

Issue 22429004: Refactor LauncherDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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
« no previous file with comments | « ash/launcher/app_list_launcher_item_delegate.cc ('k') | ash/launcher/launcher_delegate.h » ('j') | ash/launcher/launcher_delegate_proxy.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher.cc
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index 008646de6d5ecd90aea574a36ed627f65d9906b5..916fdbe829a30cb683cce4991700280f791dc373 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -9,6 +9,7 @@
#include "ash/focus_cycler.h"
#include "ash/launcher/launcher_delegate.h"
+#include "ash/launcher/launcher_item_delegate.h"
#include "ash/launcher/launcher_model.h"
#include "ash/launcher/launcher_navigator.h"
#include "ash/launcher/launcher_view.h"
@@ -108,7 +109,10 @@ void Launcher::ActivateLauncherItem(int index) {
const ash::LauncherItems& items =
launcher_view_->model()->items();
- delegate_->ItemSelected(items[index], event);
+ LauncherItemDelegate* item_delegate =
sky 2013/08/23 20:23:14 Do we ever have a NULL delegate?
simonhong_ 2013/08/26 08:47:10 item_delegate is always not NULL.
+ delegate_->GetLauncherItemDelegate(items[index]);
+ if (item_delegate)
+ item_delegate->ItemSelected(items[index], event);
}
void Launcher::CycleWindowLinear(CycleDirection direction) {
« no previous file with comments | « ash/launcher/app_list_launcher_item_delegate.cc ('k') | ash/launcher/launcher_delegate.h » ('j') | ash/launcher/launcher_delegate_proxy.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698