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

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

Issue 23983013: ash: Rename LauncherAlignmentMenu to ShelfAlignmentMenu and move to shelf/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix header include guard Created 7 years, 3 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: chrome/browser/ui/ash/launcher/launcher_context_menu.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
index 14930dde1dcc5ce8adfdde88f4bd81ba7a612e38..113da62f2e824073d1efdb4f2c0af5e116351c42 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.cc
@@ -42,7 +42,7 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
: ui::SimpleMenuModel(NULL),
controller_(controller),
item_(*item),
- launcher_alignment_menu_(root),
+ shelf_alignment_menu_(root),
root_window_(root) {
DCHECK(item);
DCHECK(root_window_);
@@ -54,7 +54,7 @@ LauncherContextMenu::LauncherContextMenu(ChromeLauncherController* controller,
: ui::SimpleMenuModel(NULL),
controller_(controller),
item_(ash::LauncherItem()),
- launcher_alignment_menu_(root),
+ shelf_alignment_menu_(root),
extension_items_(new extensions::ContextMenuMatcher(
controller->profile(), this, this,
base::Bind(MenuItemHasLauncherContext))),
@@ -148,7 +148,7 @@ void LauncherContextMenu::Init() {
if (ash::ShelfWidget::ShelfAlignmentAllowed()) {
AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
IDS_ASH_SHELF_CONTEXT_MENU_POSITION,
- &launcher_alignment_menu_);
+ &shelf_alignment_menu_);
}
#if defined(OS_CHROMEOS)
AddItem(MENU_CHANGE_WALLPAPER,
« ash/shelf/shelf_alignment_menu.h ('K') | « chrome/browser/ui/ash/launcher/launcher_context_menu.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698