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

Unified Diff: ash/wm/workspace/workspace_event_handler.h

Issue 114643003: Use a single ToplevelWindowEventHandler for the ash::Shell (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/wm/toplevel_window_event_handler.cc ('k') | ash/wm/workspace/workspace_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_event_handler.h
diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/wm/workspace/workspace_event_handler.h
index e8507e167bf8f16e79d69fcf95e09d2955d92973..65a05ac81d78a1326d5c6a3c1269f3810cdf63f8 100644
--- a/ash/wm/workspace/workspace_event_handler.h
+++ b/ash/wm/workspace/workspace_event_handler.h
@@ -5,12 +5,8 @@
#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_
-#include "ash/wm/toplevel_window_event_handler.h"
#include "ash/wm/workspace/multi_window_resize_controller.h"
-
-namespace aura {
-class Window;
-}
+#include "ui/events/event_handler.h"
namespace ash {
namespace wm {
@@ -21,12 +17,12 @@ namespace internal {
class WorkspaceEventHandlerTestHelper;
-class WorkspaceEventHandler : public ToplevelWindowEventHandler {
+class WorkspaceEventHandler : public ui::EventHandler {
public:
- explicit WorkspaceEventHandler(aura::Window* owner);
+ WorkspaceEventHandler();
virtual ~WorkspaceEventHandler();
- // Overridden from ToplevelWindowEventHandler:
+ // ui::EventHandler:
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
« no previous file with comments | « ash/wm/toplevel_window_event_handler.cc ('k') | ash/wm/workspace/workspace_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698