Chromium Code Reviews| Index: ash/launcher/launcher_alignment_menu.cc |
| diff --git a/ash/launcher/launcher_alignment_menu.cc b/ash/launcher/launcher_alignment_menu.cc |
| index 13a92bc29e2fe1c60400184e9c8338a2459706af..622245ec5e9d51a1973e08c8ba3f7af3fb14d157 100644 |
| --- a/ash/launcher/launcher_alignment_menu.cc |
| +++ b/ash/launcher/launcher_alignment_menu.cc |
| @@ -13,26 +13,23 @@ |
| namespace ash { |
| -LauncherAlignmentMenu::LauncherAlignmentMenu( |
| - aura::RootWindow* root) |
|
tfarina
2013/08/03 02:33:56
all these formatting changes was clang-format, not
xiyuan
2013/08/03 04:44:40
clang-format does not always do the right thing. P
tfarina
2013/08/03 06:53:15
Done.
|
| - : ui::SimpleMenuModel(NULL), |
| - root_window_(root) { |
| +LauncherAlignmentMenu::LauncherAlignmentMenu(aura::RootWindow* root) |
| + : ui::SimpleMenuModel(NULL), root_window_(root) { |
| DCHECK(root_window_); |
| int align_group_id = 1; |
| set_delegate(this); |
| AddRadioItemWithStringId(MENU_ALIGN_LEFT, |
| - IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_LEFT, |
| + IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT, |
| align_group_id); |
| AddRadioItemWithStringId(MENU_ALIGN_BOTTOM, |
| - IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_BOTTOM, |
| + IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM, |
| align_group_id); |
| AddRadioItemWithStringId(MENU_ALIGN_RIGHT, |
| - IDS_AURA_LAUNCHER_CONTEXT_MENU_ALIGN_RIGHT, |
| + IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT, |
| align_group_id); |
| } |
| -LauncherAlignmentMenu::~LauncherAlignmentMenu() { |
| -} |
| +LauncherAlignmentMenu::~LauncherAlignmentMenu() {} |
| bool LauncherAlignmentMenu::IsCommandIdChecked(int command_id) const { |
| return internal::ShelfLayoutManager::ForLauncher(root_window_)-> |