| 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 93%
|
| rename from blimp/client/feature/compositor/blimp_input_manager.h
|
| rename to blimp/client/core/input/blimp_input_manager.h
|
| index 120988a15657739f2a73872ad9c1a0987462f46e..6ece9533039c09dd192ab08476fd211d677b8fd0 100644
|
| --- a/blimp/client/feature/compositor/blimp_input_manager.h
|
| +++ b/blimp/client/core/input/blimp_input_manager.h
|
| @@ -2,21 +2,26 @@
|
| // 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/memory/weak_ptr.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 "ui/events/gesture_detection/filtered_gesture_provider.h"
|
| #include "ui/events/gesture_detection/motion_event.h"
|
|
|
| +namespace cc {
|
| +class InputHandler;
|
| +} // namespace cc
|
| +
|
| namespace blimp {
|
| namespace client {
|
| +class BlimpInputHandlerWrapper;
|
|
|
| class BlimpInputManagerClient {
|
| public:
|
| @@ -106,4 +111,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_
|
|
|