| Index: content/renderer/input/render_widget_input_handler.h
|
| diff --git a/content/renderer/input/render_widget_input_handler.h b/content/renderer/input/render_widget_input_handler.h
|
| index a82968bfe3b5ca6c90852250ca7b1b2aa613bcc8..c74459afa666749223764a83c07b59407ba222d9 100644
|
| --- a/content/renderer/input/render_widget_input_handler.h
|
| +++ b/content/renderer/input/render_widget_input_handler.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_
|
| #define CONTENT_RENDERER_INPUT_RENDER_WIDGET_INPUT_HANDLER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/time/time.h"
|
| #include "content/common/input/did_overscroll_params.h"
|
| #include "content/common/input/input_event_ack.h"
|
| @@ -88,7 +89,7 @@ class CONTENT_EXPORT RenderWidgetInputHandler {
|
| // handled. If the event causes overscroll, the overscroll metadata can be
|
| // bundled in the event ack, saving an IPC. Note that we must continue
|
| // supporting overscroll IPC notifications due to fling animation updates.
|
| - scoped_ptr<DidOverscrollParams>* handling_event_overscroll_;
|
| + std::unique_ptr<DidOverscrollParams>* handling_event_overscroll_;
|
|
|
| // Type of the input event we are currently handling.
|
| blink::WebInputEvent::Type handling_event_type_;
|
| @@ -104,7 +105,7 @@ class CONTENT_EXPORT RenderWidgetInputHandler {
|
| // Whether we should not send ack for the current mouse move.
|
| bool ignore_ack_for_mouse_move_from_debugger_;
|
|
|
| - scoped_ptr<InputEventAck> pending_input_event_ack_;
|
| + std::unique_ptr<InputEventAck> pending_input_event_ack_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderWidgetInputHandler);
|
| };
|
|
|