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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.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: Call OnShelfAlignmentChanged after LayoutShelf. 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: chrome/browser/ui/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index a61c8860b1f1689fcb6acb497ce382e84337fde8..4d199ecad67372cca90f99b79cb2e31b25191eef 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -142,14 +142,14 @@ ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
}
ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
- aura::Window* root_window,
+ ash::Shelf* shelf,
const ash::ShelfItem* item) {
DCHECK(shelf_delegate_);
// Don't show context menu for exclusive app runtime mode.
if (chrome::IsRunningInAppMode())
return nullptr;
- return new LauncherContextMenu(shelf_delegate_, item, root_window);
+ return new LauncherContextMenu(shelf_delegate_, item, shelf);
}
ash::GPUSupport* ChromeShellDelegate::CreateGPUSupport() {
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698