Index: components/mus/ws/event_dispatcher.h |
diff --git a/components/mus/ws/event_dispatcher.h b/components/mus/ws/event_dispatcher.h |
index e1a5d2278dc3c4bf4161e1f9d7fe2d32d4f3e7d5..c24fac42484bf5eaf59cb8ed19e2c812b632b99f 100644 |
--- a/components/mus/ws/event_dispatcher.h |
+++ b/components/mus/ws/event_dispatcher.h |
@@ -15,18 +15,12 @@ |
#include "ui/mojo/events/input_events.mojom.h" |
#include "ui/mojo/events/input_key_codes.mojom.h" |
-namespace gfx { |
-class Point; |
-} |
- |
namespace mus { |
namespace ws { |
class EventDispatcherDelegate; |
-class MoveLoop; |
-class ServerWindow; |
- |
class EventMatcher; |
+class ServerWindow; |
// Handles dispatching events to the right location as well as updating focus. |
class EventDispatcher { |
@@ -55,19 +49,18 @@ class EventDispatcher { |
// make sure it is in the returned target's coordinate space. |
ServerWindow* FindEventTarget(mojo::Event* event); |
- void ResetCaptureWindowIfPointerUp(const mojo::Event& event); |
- |
EventDispatcherDelegate* delegate_; |
ServerWindow* root_; |
cc::SurfaceId surface_id_; |
ServerWindow* capture_window_; |
+ // Was the capture the result of clicking in the non-client area? |
+ bool capture_in_nonclient_area_; |
+ |
using Entry = std::pair<uint32_t, EventMatcher>; |
std::map<uint32_t, EventMatcher> accelerators_; |
- scoped_ptr<MoveLoop> move_loop_; |
- |
DISALLOW_COPY_AND_ASSIGN(EventDispatcher); |
}; |