Chromium Code Reviews| Index: blimp/client/core/input/blimp_input_manager.h |
| diff --git a/blimp/client/feature/compositor/blimp_input_manager.h b/blimp/client/core/input/blimp_input_manager.h |
| similarity index 85% |
| rename from blimp/client/feature/compositor/blimp_input_manager.h |
| rename to blimp/client/core/input/blimp_input_manager.h |
| index 120988a15657739f2a73872ad9c1a0987462f46e..dc334437a26997cbc954b476b1b519b999e07560 100644 |
| --- a/blimp/client/feature/compositor/blimp_input_manager.h |
| +++ b/blimp/client/core/input/blimp_input_manager.h |
| @@ -2,21 +2,36 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_INPUT_MANAGER_H_ |
| -#define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_INPUT_MANAGER_H_ |
| +#ifndef BLIMP_CLIENT_CORE_INPUT_BLIMP_INPUT_MANAGER_H_ |
| +#define BLIMP_CLIENT_CORE_INPUT_BLIMP_INPUT_MANAGER_H_ |
| #include <memory> |
| #include "base/macros.h" |
| -#include "base/single_thread_task_runner.h" |
| -#include "base/synchronization/waitable_event.h" |
| -#include "blimp/client/feature/compositor/blimp_input_handler_wrapper.h" |
| -#include "third_party/WebKit/public/web/WebInputEvent.h" |
| +#include "base/memory/weak_ptr.h" |
| #include "ui/events/gesture_detection/filtered_gesture_provider.h" |
| -#include "ui/events/gesture_detection/motion_event.h" |
| + |
| +namespace base { |
| +class SingleThreadTaskRunner; |
| +class WaitableEvent; |
| +} // namespace base |
| + |
| +namespace blink { |
| +class WebInputEvent; |
| +class WebGestureEvent; |
| +} // namespace blink |
| + |
| +namespace cc { |
| +class InputHandler; |
| +} // namespace cc |
| + |
| +namespace ui { |
| +class MotionEvent; |
| +} // namespace ui |
| namespace blimp { |
| namespace client { |
| +class BlimpInputHandlerWrapper; |
| class BlimpInputManagerClient { |
| public: |
| @@ -86,6 +101,9 @@ class BlimpInputManager : public ui::GestureProviderClient { |
| BlimpInputManagerClient* client_; |
| + // Move out the gesture provider bits from the input manager. They should |
|
nyquist
2016/08/16 23:14:57
Is this a TODO?
Khushal
2016/08/18 02:01:46
Done.
|
| + // exist in the document view and the manager should only get web input |
| + // events. |
| ui::FilteredGestureProvider gesture_provider_; |
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
| @@ -106,4 +124,4 @@ class BlimpInputManager : public ui::GestureProviderClient { |
| } // namespace client |
| } // namespace blimp |
| -#endif // BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_INPUT_MANAGER_H_ |
| +#endif // BLIMP_CLIENT_CORE_INPUT_BLIMP_INPUT_MANAGER_H_ |