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

Unified Diff: ash/shell.cc

Issue 2336883002: mash: Port context menu code to WmShell and WmRootWindowController. (Closed)
Patch Set: Fix error. 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
« no previous file with comments | « ash/shell.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 9838d51824d8a8eca7f64159f1cb624cc639a37d..ce3315c6e6080966f2b780fbbac4c4e0867ee7df 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -264,21 +264,6 @@ const aura::Window* Shell::GetContainer(const aura::Window* root_window,
return root_window->GetChildById(container_id);
}
-void Shell::ShowContextMenu(const gfx::Point& location_in_screen,
- ui::MenuSourceType source_type) {
- // No context menus if there is no session with an active user.
- if (!session_state_delegate_->NumberOfLoggedInUsers())
- return;
- // No context menus when screen is locked.
- if (session_state_delegate_->IsScreenLocked())
- return;
-
- aura::Window* root = WmWindowAura::GetAuraWindow(
- wm::GetRootWindowMatching(gfx::Rect(location_in_screen, gfx::Size())));
- GetRootWindowController(root)->ShowContextMenu(location_in_screen,
- source_type);
-}
-
views::NonClientFrameView* Shell::CreateDefaultNonClientFrameView(
views::Widget* widget) {
// Use translucent-style window frames for dialogs.
« no previous file with comments | « ash/shell.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698