Chromium Code Reviews| Index: ash/common/wm/workspace/workspace_event_handler.h |
| diff --git a/ash/wm/workspace/workspace_event_handler.h b/ash/common/wm/workspace/workspace_event_handler.h |
| similarity index 74% |
| rename from ash/wm/workspace/workspace_event_handler.h |
| rename to ash/common/wm/workspace/workspace_event_handler.h |
| index ea8d78a989ded72a271d0613018193ea76826540..22c207781bda482fb457942843a21e76479de05c 100644 |
| --- a/ash/wm/workspace/workspace_event_handler.h |
| +++ b/ash/common/wm/workspace/workspace_event_handler.h |
| @@ -2,28 +2,33 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |
| -#define ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |
| +#ifndef ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |
| +#define ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |
| +#include "ash/ash_export.h" |
| #include "ash/common/wm/workspace/multi_window_resize_controller.h" |
| #include "base/macros.h" |
| -#include "ui/events/event_handler.h" |
| + |
| +namespace ui { |
| +class GestureEvent; |
| +class MouseEvent; |
| +} |
| namespace ash { |
| +class WmWindow; |
| class WorkspaceEventHandlerTestHelper; |
| namespace wm { |
| class WindowState; |
| } |
| -class WorkspaceEventHandler : public ui::EventHandler { |
| +class ASH_EXPORT WorkspaceEventHandler { |
|
James Cook
2016/08/26 19:07:16
Can you add a class comment?
sky
2016/08/26 20:19:16
Done.
|
| public: |
| WorkspaceEventHandler(); |
| - ~WorkspaceEventHandler() override; |
| + virtual ~WorkspaceEventHandler(); |
| - // ui::EventHandler: |
| - void OnMouseEvent(ui::MouseEvent* event) override; |
| - void OnGestureEvent(ui::GestureEvent* event) override; |
| + void OnMouseEvent(ui::MouseEvent* event, WmWindow* target); |
| + void OnGestureEvent(ui::GestureEvent* event, WmWindow* target); |
| private: |
| friend class WorkspaceEventHandlerTestHelper; |
| @@ -49,4 +54,4 @@ class WorkspaceEventHandler : public ui::EventHandler { |
| } // namespace ash |
| -#endif // ASH_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |
| +#endif // ASH_COMMON_WM_WORKSPACE_WORKSPACE_EVENT_HANDLER_H_ |