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

Unified Diff: ash/launcher/launcher_alignment_menu.cc

Issue 11434099: Use the correct launcher assets for shelf alignment. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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
« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/launcher/launcher_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_alignment_menu.cc
diff --git a/ash/launcher/launcher_alignment_menu.cc b/ash/launcher/launcher_alignment_menu.cc
index cfa242c19248b1c34e3f65ff6e4c31ed7a3cdc64..1136baa43d9d678c6d98d8c0ce4102db836136dd 100644
--- a/ash/launcher/launcher_alignment_menu.cc
+++ b/ash/launcher/launcher_alignment_menu.cc
@@ -6,7 +6,9 @@
#include "ash/shelf_types.h"
#include "ash/shell.h"
+#include "ash/wm/shelf_layout_manager.h"
#include "grit/ash_strings.h"
+#include "ui/aura/root_window.h"
#include "ui/base/l10n/l10n_util.h"
namespace ash {
@@ -33,19 +35,11 @@ LauncherAlignmentMenu::~LauncherAlignmentMenu() {
}
bool LauncherAlignmentMenu::IsCommandIdChecked(int command_id) const {
- switch (command_id) {
- case MENU_ALIGN_LEFT:
- return Shell::GetInstance()->GetShelfAlignment(root_window_) ==
- SHELF_ALIGNMENT_LEFT;
- case MENU_ALIGN_BOTTOM:
- return Shell::GetInstance()->GetShelfAlignment(root_window_) ==
- SHELF_ALIGNMENT_BOTTOM;
- case MENU_ALIGN_RIGHT:
- return Shell::GetInstance()->GetShelfAlignment(root_window_) ==
- SHELF_ALIGNMENT_RIGHT;
- default:
- return false;
- }
+ return internal::ShelfLayoutManager::ForLauncher(root_window_)->
+ SelectValueForShelfAlignment(
+ MENU_ALIGN_BOTTOM == command_id,
+ MENU_ALIGN_LEFT == command_id,
+ MENU_ALIGN_RIGHT == command_id);
}
bool LauncherAlignmentMenu::IsCommandIdEnabled(int command_id) const {
« no previous file with comments | « ash/launcher/launcher.cc ('k') | ash/launcher/launcher_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698