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

Unified Diff: ash/mus/context_menu_mus.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. Created 4 years, 4 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/sysui/context_menu_mus.cc b/ash/mus/context_menu_mus.cc
similarity index 77%
rename from ash/sysui/context_menu_mus.cc
rename to ash/mus/context_menu_mus.cc
index 73207030592efbee737c4f466ff654159767bc92..6b31f61443aca61711de2aa483f6fffcaac46747 100644
--- a/ash/sysui/context_menu_mus.cc
+++ b/ash/mus/context_menu_mus.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/sysui/context_menu_mus.h"
+#include "ash/mus/context_menu_mus.h"
#include "ash/common/shelf/shelf_types.h"
#include "ash/common/shelf/wm_shelf.h"
-#include "ash/desktop_background/user_wallpaper_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wallpaper/wallpaper_delegate.h"
+#include "ash/common/wm_shell.h"
#include "grit/ash_strings.h"
namespace ash {
@@ -35,9 +35,9 @@ bool ContextMenuMus::IsCommandIdChecked(int command_id) const {
}
bool ContextMenuMus::IsCommandIdEnabled(int command_id) const {
- Shell* shell = Shell::GetInstance();
- if (command_id == MENU_CHANGE_WALLPAPER)
- return shell->user_wallpaper_delegate()->CanOpenSetWallpaperPage();
+ // TODO(msw): Port WallpaperDelegateMus and support this (crbug.com/629605):
+ // if (command_id == MENU_CHANGE_WALLPAPER)
+ // return WmShell::Get()->wallpaper_delegate()->CanOpenSetWallpaperPage();
return true;
}
@@ -48,7 +48,8 @@ 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) {
- Shell::GetInstance()->user_wallpaper_delegate()->OpenSetWallpaperPage();
+ // TODO(msw): Port WallpaperDelegateMus and support this (crbug.com/629605):
+ // WmShell::Get()->wallpaper_delegate()->OpenSetWallpaperPage();
}
}

Powered by Google App Engine
This is Rietveld 408576698