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

Unified Diff: ash/shelf/shelf_alignment_menu.cc

Issue 2046563012: mash: Move shelf menu code to //ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/shelf/shelf_alignment_menu.h ('k') | ash/shelf/shelf_menu_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_alignment_menu.cc
diff --git a/ash/shelf/shelf_alignment_menu.cc b/ash/shelf/shelf_alignment_menu.cc
deleted file mode 100644
index 855e5e9227147f8c0564a676546dcf48b6b394d8..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_alignment_menu.cc
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ash/shelf/shelf_alignment_menu.h"
-
-#include "ash/common/shelf/shelf_types.h"
-#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm/wm_user_metrics_action.h"
-#include "ash/common/wm_shell.h"
-#include "grit/ash_strings.h"
-
-namespace ash {
-
-ShelfAlignmentMenu::ShelfAlignmentMenu(WmShelf* wm_shelf)
- : ui::SimpleMenuModel(nullptr), wm_shelf_(wm_shelf) {
- DCHECK(wm_shelf_);
- const int align_group_id = 1;
- set_delegate(this);
- AddRadioItemWithStringId(MENU_ALIGN_LEFT,
- IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_LEFT,
- align_group_id);
- AddRadioItemWithStringId(MENU_ALIGN_BOTTOM,
- IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_BOTTOM,
- align_group_id);
- AddRadioItemWithStringId(MENU_ALIGN_RIGHT,
- IDS_ASH_SHELF_CONTEXT_MENU_ALIGN_RIGHT,
- align_group_id);
-}
-
-ShelfAlignmentMenu::~ShelfAlignmentMenu() {}
-
-bool ShelfAlignmentMenu::IsCommandIdChecked(int command_id) const {
- switch (wm_shelf_->GetAlignment()) {
- case SHELF_ALIGNMENT_BOTTOM:
- case SHELF_ALIGNMENT_BOTTOM_LOCKED:
- return command_id == MENU_ALIGN_BOTTOM;
- case SHELF_ALIGNMENT_LEFT:
- return command_id == MENU_ALIGN_LEFT;
- case SHELF_ALIGNMENT_RIGHT:
- return command_id == MENU_ALIGN_RIGHT;
- }
- return false;
-}
-
-bool ShelfAlignmentMenu::IsCommandIdEnabled(int command_id) const {
- return true;
-}
-
-bool ShelfAlignmentMenu::GetAcceleratorForCommandId(
- int command_id,
- ui::Accelerator* accelerator) {
- return false;
-}
-
-void ShelfAlignmentMenu::ExecuteCommand(int command_id, int event_flags) {
- WmShell* shell = WmShell::Get();
- switch (static_cast<MenuItem>(command_id)) {
- case MENU_ALIGN_LEFT:
- shell->RecordUserMetricsAction(
- wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_LEFT);
- wm_shelf_->SetAlignment(SHELF_ALIGNMENT_LEFT);
- break;
- case MENU_ALIGN_BOTTOM:
- shell->RecordUserMetricsAction(
- wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_BOTTOM);
- wm_shelf_->SetAlignment(SHELF_ALIGNMENT_BOTTOM);
- break;
- case MENU_ALIGN_RIGHT:
- shell->RecordUserMetricsAction(
- wm::WmUserMetricsAction::SHELF_ALIGNMENT_SET_RIGHT);
- wm_shelf_->SetAlignment(SHELF_ALIGNMENT_RIGHT);
- break;
- }
-}
-
-} // namespace ash
« no previous file with comments | « ash/shelf/shelf_alignment_menu.h ('k') | ash/shelf/shelf_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698