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

Unified Diff: ash/mus/context_menu_mus.cc

Issue 2899253002: chromeos: Rename ash::WmShelf to Shelf (Closed)
Patch Set: rebase Created 3 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/mus/context_menu_mus.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/context_menu_mus.cc
diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc
index 1bf25850c25e8a480878880c92324780c90adec5..0d81f48a87abb3f9f79006003bcec992638055b1 100644
--- a/ash/mus/context_menu_mus.cc
+++ b/ash/mus/context_menu_mus.cc
@@ -5,7 +5,7 @@
#include "ash/mus/context_menu_mus.h"
#include "ash/public/cpp/shelf_types.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ash/wallpaper/wallpaper_controller.h"
@@ -13,10 +13,8 @@
namespace ash {
-ContextMenuMus::ContextMenuMus(WmShelf* wm_shelf)
- : ui::SimpleMenuModel(nullptr),
- wm_shelf_(wm_shelf),
- alignment_menu_(wm_shelf) {
+ContextMenuMus::ContextMenuMus(Shelf* shelf)
+ : ui::SimpleMenuModel(nullptr), shelf_(shelf), alignment_menu_(shelf) {
set_delegate(this);
AddCheckItemWithStringId(MENU_AUTO_HIDE,
IDS_ASH_SHELF_CONTEXT_MENU_AUTO_HIDE);
@@ -29,7 +27,7 @@ ContextMenuMus::~ContextMenuMus() {}
bool ContextMenuMus::IsCommandIdChecked(int command_id) const {
if (command_id == MENU_AUTO_HIDE)
- return wm_shelf_->auto_hide_behavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
+ return shelf_->auto_hide_behavior() == SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS;
return false;
}
@@ -41,10 +39,10 @@ bool ContextMenuMus::IsCommandIdEnabled(int command_id) const {
void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) {
if (command_id == MENU_AUTO_HIDE) {
- wm_shelf_->SetAutoHideBehavior(wm_shelf_->auto_hide_behavior() ==
- SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
- ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
- : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
+ shelf_->SetAutoHideBehavior(shelf_->auto_hide_behavior() ==
+ SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS
+ ? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
+ : SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
} else if (command_id == MENU_CHANGE_WALLPAPER) {
Shell::Get()->wallpaper_controller()->OpenSetWallpaperPage();
}
« no previous file with comments | « ash/mus/context_menu_mus.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698