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

Unified Diff: trunk/src/ash/shelf/app_list_shelf_item_delegate.h

Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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: trunk/src/ash/shelf/app_list_shelf_item_delegate.h
===================================================================
--- trunk/src/ash/shelf/app_list_shelf_item_delegate.h (revision 226578)
+++ trunk/src/ash/shelf/app_list_shelf_item_delegate.h (working copy)
@@ -20,13 +20,17 @@
virtual ~AppListShelfItemDelegate();
// ash::LauncherItemDelegate overrides:
- virtual void ItemSelected(const ui::Event& event) OVERRIDE;
- virtual base::string16 GetTitle() OVERRIDE;
+ virtual void ItemSelected(const LauncherItem& item,
+ const ui::Event& event) OVERRIDE;
+ virtual base::string16 GetTitle(const LauncherItem& item) OVERRIDE;
virtual ui::MenuModel* CreateContextMenu(
+ const LauncherItem& item,
aura::RootWindow* root_window) OVERRIDE;
- virtual LauncherMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
- virtual bool IsDraggable() OVERRIDE;
- virtual bool ShouldShowTooltip() OVERRIDE;
+ virtual LauncherMenuModel* CreateApplicationMenu(
+ const LauncherItem& item,
+ int event_flags) OVERRIDE;
+ virtual bool IsDraggable(const LauncherItem& item) OVERRIDE;
+ virtual bool ShouldShowTooltip(const LauncherItem& item) OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(AppListShelfItemDelegate);
« no previous file with comments | « trunk/src/ash/launcher/launcher_view_unittest.cc ('k') | trunk/src/ash/shelf/app_list_shelf_item_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698