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

Unified Diff: ash/root_window_controller.h

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/mus/bridge/wm_shell_mus.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index 16d281deea9c0653ef7359b04b8a3dae8cba7f1c..e42aa052e4b29c38fc1e0b18cad3831b3aa2f25b 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -14,7 +14,6 @@
#include "base/macros.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
-#include "ui/base/ui_base_types.h"
class SkBitmap;
@@ -33,12 +32,9 @@ class KeyboardController;
namespace ui {
class EventHandler;
-class MenuModel;
}
namespace views {
-class MenuModelAdapter;
-class MenuRunner;
class Widget;
}
@@ -142,11 +138,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// lead to a crash.
SystemTray* GetSystemTray();
- // Shows context menu at the |location_in_screen|. This uses
- // |ShellDelegate::CreateContextMenu| to define the content of the menu.
- void ShowContextMenu(const gfx::Point& location_in_screen,
- ui::MenuSourceType source_type);
-
// True if the window can receive events on this root window.
bool CanWindowReceiveEvents(aura::Window* window);
@@ -231,9 +222,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
// Disables projection touch HUD.
void DisableTouchHudProjection();
- // Callback for MenuModelAdapter.
- void OnMenuClosed();
-
// Overridden from ShellObserver.
void OnLoginStateChanged(LoginStatus status) override;
void OnTouchHudProjectionToggled(bool enabled) override;
@@ -284,11 +272,6 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
std::unique_ptr<::wm::ScopedCaptureClient> capture_client_;
- // Manages the context menu.
- std::unique_ptr<ui::MenuModel> menu_model_;
- std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_;
- std::unique_ptr<views::MenuRunner> menu_runner_;
-
DISALLOW_COPY_AND_ASSIGN(RootWindowController);
};
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698