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

Unified Diff: ash/test/test_shell_delegate.cc

Issue 2046843005: mash: Migrate shelf menus to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ash_shell_with_content 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/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_shell_delegate.cc
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 916e0f68dbf1dde893f960ebf6f3172c2b08fda1..545d2d198bb0362ae3b1449e3a38bcbe71bc12a5 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -216,9 +216,8 @@ TestShellDelegate::CreatePointerWatcherDelegate() {
return base::WrapUnique(new PointerWatcherDelegateAura);
}
-ui::MenuModel* TestShellDelegate::CreateContextMenu(
- ash::Shelf* shelf,
- const ash::ShelfItem* item) {
+ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf,
+ const ShelfItem* item) {
return nullptr;
}
« no previous file with comments | « ash/test/test_shell_delegate.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698