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

Unified Diff: ash/mus/context_menu_mus.cc

Issue 2323063003: mash: Port sysui's WallpaperDelegateMus to mojo:ash. (Closed)
Patch Set: Alternative display info workaround. Created 4 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/mus/context_menu_mus.cc
diff --git a/ash/mus/context_menu_mus.cc b/ash/mus/context_menu_mus.cc
index 6b31f61443aca61711de2aa483f6fffcaac46747..de071b6b942d029166bdcf8ded635dbc4a177b58 100644
--- a/ash/mus/context_menu_mus.cc
+++ b/ash/mus/context_menu_mus.cc
@@ -35,9 +35,8 @@ bool ContextMenuMus::IsCommandIdChecked(int command_id) const {
}
bool ContextMenuMus::IsCommandIdEnabled(int command_id) const {
- // TODO(msw): Port WallpaperDelegateMus and support this (crbug.com/629605):
- // if (command_id == MENU_CHANGE_WALLPAPER)
- // return WmShell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage();
+ if (command_id == MENU_CHANGE_WALLPAPER)
+ return WmShell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage();
return true;
}
@@ -48,8 +47,7 @@ void ContextMenuMus::ExecuteCommand(int command_id, int event_flags) {
? SHELF_AUTO_HIDE_BEHAVIOR_NEVER
: SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
} else if (command_id == MENU_CHANGE_WALLPAPER) {
- // TODO(msw): Port WallpaperDelegateMus and support this (crbug.com/629605):
- // WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();
+ WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();
}
}

Powered by Google App Engine
This is Rietveld 408576698