Index: components/renderer_context_menu/render_view_context_menu_base.h |
diff --git a/components/renderer_context_menu/render_view_context_menu_base.h b/components/renderer_context_menu/render_view_context_menu_base.h |
index 1b0d83921fca6824b4705c4f4c46da582f2299b7..604b644c8db6f11cd1aec1a86eaac42262d94a79 100644 |
--- a/components/renderer_context_menu/render_view_context_menu_base.h |
+++ b/components/renderer_context_menu/render_view_context_menu_base.h |
@@ -6,12 +6,13 @@ |
#define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_VIEW_CONTEXT_MENU_BASE_H_ |
#include <stddef.h> |
+ |
#include <map> |
+#include <memory> |
#include <string> |
#include <utility> |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/observer_list.h" |
#include "base/strings/string16.h" |
@@ -120,7 +121,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, |
content_type_.reset(content_type); |
} |
- void set_toolkit_delegate(scoped_ptr<ToolkitDelegate> delegate) { |
+ void set_toolkit_delegate(std::unique_ptr<ToolkitDelegate> delegate) { |
toolkit_delegate_ = std::move(delegate); |
} |
@@ -188,7 +189,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, |
// should be notified of menu closing without execution. |
bool command_executed_; |
- scoped_ptr<ContextMenuContentType> content_type_; |
+ std::unique_ptr<ContextMenuContentType> content_type_; |
private: |
bool AppendCustomItems(); |
@@ -196,7 +197,7 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, |
// The RenderFrameHost's IDs. |
const int render_process_id_; |
- scoped_ptr<ToolkitDelegate> toolkit_delegate_; |
+ std::unique_ptr<ToolkitDelegate> toolkit_delegate_; |
ScopedVector<ui::SimpleMenuModel> custom_submenus_; |