| Index: third_party/WebKit/Source/core/page/ContextMenuController.h
|
| diff --git a/third_party/WebKit/Source/core/page/ContextMenuController.h b/third_party/WebKit/Source/core/page/ContextMenuController.h
|
| index fadbade7a8bd0b730df801ecbb0e0bcffbb8311a..3f62e0ad9ffab917a4ee76ca2a60489525b686f3 100644
|
| --- a/third_party/WebKit/Source/core/page/ContextMenuController.h
|
| +++ b/third_party/WebKit/Source/core/page/ContextMenuController.h
|
| @@ -30,9 +30,9 @@
|
| #include "core/layout/HitTestResult.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefPtr.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -68,13 +68,13 @@ public:
|
| private:
|
| ContextMenuController(Page*, ContextMenuClient*);
|
|
|
| - PassOwnPtr<ContextMenu> createContextMenu(Event*);
|
| - PassOwnPtr<ContextMenu> createContextMenu(LocalFrame*, const LayoutPoint&);
|
| + std::unique_ptr<ContextMenu> createContextMenu(Event*);
|
| + std::unique_ptr<ContextMenu> createContextMenu(LocalFrame*, const LayoutPoint&);
|
| void populateCustomContextMenu(const Event&);
|
| void showContextMenu(Event*);
|
|
|
| ContextMenuClient* m_client;
|
| - OwnPtr<ContextMenu> m_contextMenu;
|
| + std::unique_ptr<ContextMenu> m_contextMenu;
|
| Member<ContextMenuProvider> m_menuProvider;
|
| HitTestResult m_hitTestResult;
|
| };
|
|
|