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

Unified Diff: ash/shelf/shelf_alignment_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: ash/shelf/shelf_alignment_menu.cc
diff --git a/ash/launcher/launcher_alignment_menu.cc b/ash/shelf/shelf_alignment_menu.cc
similarity index 78%
rename from ash/launcher/launcher_alignment_menu.cc
rename to ash/shelf/shelf_alignment_menu.cc
index 8d6b6cfdcd3b5ac00d178309e3be8163a190f8b9..4da6ace7753daab8c3b29fbbc37e10c4122a8c4d 100644
--- a/ash/launcher/launcher_alignment_menu.cc
+++ b/ash/shelf/shelf_alignment_menu.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/launcher/launcher_alignment_menu.h"
+#include "ash/shelf/shelf_alignment_menu.h"
#include "ash/shelf/shelf_layout_manager.h"
#include "ash/shelf/shelf_types.h"
@@ -13,7 +13,7 @@
namespace ash {
-LauncherAlignmentMenu::LauncherAlignmentMenu(aura::RootWindow* root)
+ShelfAlignmentMenu::ShelfAlignmentMenu(aura::RootWindow* root)
: ui::SimpleMenuModel(NULL),
root_window_(root) {
DCHECK(root_window_);
@@ -30,9 +30,9 @@ LauncherAlignmentMenu::LauncherAlignmentMenu(aura::RootWindow* root)
align_group_id);
}
-LauncherAlignmentMenu::~LauncherAlignmentMenu() {}
+ShelfAlignmentMenu::~ShelfAlignmentMenu() {}
-bool LauncherAlignmentMenu::IsCommandIdChecked(int command_id) const {
+bool ShelfAlignmentMenu::IsCommandIdChecked(int command_id) const {
return internal::ShelfLayoutManager::ForLauncher(root_window_)->
SelectValueForShelfAlignment(
MENU_ALIGN_BOTTOM == command_id,
@@ -41,17 +41,17 @@ bool LauncherAlignmentMenu::IsCommandIdChecked(int command_id) const {
false);
}
-bool LauncherAlignmentMenu::IsCommandIdEnabled(int command_id) const {
+bool ShelfAlignmentMenu::IsCommandIdEnabled(int command_id) const {
return true;
}
-bool LauncherAlignmentMenu::GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) {
+bool ShelfAlignmentMenu::GetAcceleratorForCommandId(
+ int command_id,
+ ui::Accelerator* accelerator) {
return false;
}
-void LauncherAlignmentMenu::ExecuteCommand(int command_id, int event_flags) {
+void ShelfAlignmentMenu::ExecuteCommand(int command_id, int event_flags) {
switch (static_cast<MenuItem>(command_id)) {
case MENU_ALIGN_LEFT:
Shell::GetInstance()->SetShelfAlignment(SHELF_ALIGNMENT_LEFT,

Powered by Google App Engine
This is Rietveld 408576698