| Index: ui/events/gestures/blink/web_gesture_curve_impl.h
|
| diff --git a/content/child/web_gesture_curve_impl.h b/ui/events/gestures/blink/web_gesture_curve_impl.h
|
| similarity index 73%
|
| rename from content/child/web_gesture_curve_impl.h
|
| rename to ui/events/gestures/blink/web_gesture_curve_impl.h
|
| index 026158ce9060d69d4195912b43e5023742b2627e..feb17383c587fee98497c36e470039eed6999d13 100644
|
| --- a/content/child/web_gesture_curve_impl.h
|
| +++ b/ui/events/gestures/blink/web_gesture_curve_impl.h
|
| @@ -2,12 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_CHILD_WEB_GESTURE_CURVE_IMPL_H_
|
| -#define CONTENT_CHILD_WEB_GESTURE_CURVE_IMPL_H_
|
| +#ifndef UI_EVENTS_GESTURES_BLINK_WEB_GESTURE_CURVE_IMPL_H_
|
| +#define UI_EVENTS_GESTURES_BLINK_WEB_GESTURE_CURVE_IMPL_H_
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "content/common/content_export.h"
|
| #include "third_party/WebKit/public/platform/WebGestureCurve.h"
|
| #include "ui/gfx/geometry/vector2d_f.h"
|
|
|
| @@ -17,19 +16,15 @@ class WebGestureCurveTarget;
|
|
|
| namespace ui {
|
| class GestureCurve;
|
| -}
|
| -
|
| -namespace content {
|
|
|
| -class CONTENT_EXPORT WebGestureCurveImpl
|
| - : public NON_EXPORTED_BASE(blink::WebGestureCurve) {
|
| +class WebGestureCurveImpl : public NON_EXPORTED_BASE(blink::WebGestureCurve) {
|
| public:
|
| static scoped_ptr<blink::WebGestureCurve> CreateFromDefaultPlatformCurve(
|
| const gfx::Vector2dF& initial_velocity,
|
| const gfx::Vector2dF& initial_offset,
|
| bool on_main_thread);
|
| static scoped_ptr<blink::WebGestureCurve> CreateFromUICurveForTesting(
|
| - scoped_ptr<ui::GestureCurve> curve,
|
| + scoped_ptr<GestureCurve> curve,
|
| const gfx::Vector2dF& initial_offset);
|
|
|
| virtual ~WebGestureCurveImpl();
|
| @@ -45,11 +40,11 @@ class CONTENT_EXPORT WebGestureCurveImpl
|
| TEST
|
| };
|
|
|
| - WebGestureCurveImpl(scoped_ptr<ui::GestureCurve> curve,
|
| + WebGestureCurveImpl(scoped_ptr<GestureCurve> curve,
|
| const gfx::Vector2dF& initial_offset,
|
| ThreadType animating_thread_type);
|
|
|
| - scoped_ptr<ui::GestureCurve> curve_;
|
| + scoped_ptr<GestureCurve> curve_;
|
|
|
| gfx::Vector2dF last_offset_;
|
|
|
| @@ -61,6 +56,6 @@ class CONTENT_EXPORT WebGestureCurveImpl
|
| DISALLOW_COPY_AND_ASSIGN(WebGestureCurveImpl);
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace ui
|
|
|
| -#endif // CONTENT_CHILD_WEB_GESTURE_CURVE_IMPL_H_
|
| +#endif // UI_EVENTS_GESTURES_BLINK_WEB_GESTURE_CURVE_IMPL_H_
|
|
|