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

Unified Diff: ash/launcher/launcher_context_menu.cc

Issue 10388036: Adds the option of aligning the launcher to the left or right. There (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile Created 8 years, 7 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/launcher_context_menu.h ('k') | ash/launcher/launcher_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_context_menu.cc
diff --git a/ash/launcher/launcher_context_menu.cc b/ash/launcher/launcher_context_menu.cc
index dd0604e52b4b692310e3a92c02c9bfad1215d2d5..7b586ba6dcbb5fbf5b4183eb202b0d90401d0662 100644
--- a/ash/launcher/launcher_context_menu.cc
+++ b/ash/launcher/launcher_context_menu.cc
@@ -5,6 +5,7 @@
#include "ash/launcher/launcher_context_menu.h"
#include "ash/shell.h"
+#include "ash/wm/shelf_auto_hide_behavior.h"
#include "grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -13,6 +14,9 @@ namespace ash {
LauncherContextMenu::LauncherContextMenu() : ui::SimpleMenuModel(NULL) {
set_delegate(this);
AddCheckItemWithStringId(MENU_AUTO_HIDE, GetAutoHideResourceStringId());
+ AddSubMenuWithStringId(MENU_ALIGNMENT_MENU,
+ IDS_AURA_LAUNCHER_CONTEXT_MENU_POSITION,
+ &alignment_menu_);
}
LauncherContextMenu::~LauncherContextMenu() {
@@ -79,6 +83,8 @@ void LauncherContextMenu::ExecuteCommand(int command_id) {
ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
GetToggledAutoHideBehavior());
break;
+ case MENU_ALIGNMENT_MENU:
+ break;
}
}
« no previous file with comments | « ash/launcher/launcher_context_menu.h ('k') | ash/launcher/launcher_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698