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

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
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 c761f2bdfe097ec2d1dae193f66fd7f92b4b676f..e0c8fb1b6a604bb4f142d6d99e124e6f935fefc6 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:
+ // Overridden from ui::EventHandler:
varkha 2013/12/13 04:05:14 nit: I think the style I was advised to use was "/
virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
@@ -42,9 +38,6 @@ class WorkspaceEventHandler : public ToplevelWindowEventHandler {
MultiWindowResizeController multi_window_resize_controller_;
- // If non-NULL, set to true in the destructor.
- bool* destroyed_;
-
DISALLOW_COPY_AND_ASSIGN(WorkspaceEventHandler);
};

Powered by Google App Engine
This is Rietveld 408576698