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

Unified Diff: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc

Issue 97173003: ash: Rename more Launcher classes to Shelf*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: link chrome Created 7 years 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: chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
index c5285722e951b69a66df36476c13d60259be049c..4f6ddd322a48cd5f8fc650a44bc9d3acb77ee7b1 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc
@@ -220,8 +220,8 @@ ui::MenuModel* AppShortcutLauncherItemController::CreateContextMenu(
return new LauncherContextMenu(launcher_controller(), &item, root_window);
}
-ash::LauncherMenuModel*
-AppShortcutLauncherItemController::CreateApplicationMenu(int event_flags) {
+ash::ShelfMenuModel* AppShortcutLauncherItemController::CreateApplicationMenu(
+ int event_flags) {
return new LauncherApplicationMenuItemModel(GetApplicationList(event_flags));
}

Powered by Google App Engine
This is Rietveld 408576698