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

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 1812013003: Pass shelf instances, not root windows, for ash context menus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ash_shell_with_content; cleanup. Created 4 years, 9 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/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index d996a2222f5d1dd92f427b0a1031c549311d398c..735397638e0e8313df7c019eda01137aa8ab4af3 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -225,9 +225,9 @@ ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() {
}
ui::MenuModel* ShellDelegateImpl::CreateContextMenu(
- aura::Window* root_window,
+ ash::Shelf* shelf,
const ash::ShelfItem* item) {
- return new ContextMenu(root_window);
+ return new ContextMenu(shelf);
}
GPUSupport* ShellDelegateImpl::CreateGPUSupport() {

Powered by Google App Engine
This is Rietveld 408576698