| Index: third_party/WebKit/public/web/WebScopedUserGesture.h
|
| diff --git a/third_party/WebKit/public/web/WebScopedUserGesture.h b/third_party/WebKit/public/web/WebScopedUserGesture.h
|
| index a4e3903f3f4dc20439ba672f8492318d829aa197..4210f7c064d636129cbee074e79bc7124fa230fe 100644
|
| --- a/third_party/WebKit/public/web/WebScopedUserGesture.h
|
| +++ b/third_party/WebKit/public/web/WebScopedUserGesture.h
|
| @@ -31,7 +31,8 @@
|
| #ifndef WebScopedUserGesture_h
|
| #define WebScopedUserGesture_h
|
|
|
| -#include "../platform/WebPrivateOwnPtr.h"
|
| +#include "public/platform/WebCommon.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -53,16 +54,12 @@ class WebUserGestureToken;
|
| // gesture.
|
| class WebScopedUserGesture {
|
| public:
|
| - explicit WebScopedUserGesture(const WebUserGestureToken& token) { initializeWithToken(token); }
|
| - WebScopedUserGesture() { initialize(); }
|
| - ~WebScopedUserGesture() { reset(); }
|
| + BLINK_EXPORT explicit WebScopedUserGesture(const WebUserGestureToken& token);
|
| + BLINK_EXPORT WebScopedUserGesture();
|
| + BLINK_EXPORT ~WebScopedUserGesture();
|
|
|
| private:
|
| - BLINK_EXPORT void initialize();
|
| - BLINK_EXPORT void initializeWithToken(const WebUserGestureToken&);
|
| - BLINK_EXPORT void reset();
|
| -
|
| - WebPrivateOwnPtr<UserGestureIndicator> m_indicator;
|
| + std::unique_ptr<UserGestureIndicator> m_indicator;
|
| };
|
|
|
| } // namespace blink
|
|
|