components/renderer_context_menu/views/toolkit_delegate_views.h - Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/renderer_context_menu/views/toolkit_delegate_views.h

Issue 1921923002: Convert //components/[o-t]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/renderer_context_menu/render_view_context_menu_observer.h ('k') | components/resource_provider/public/cpp/resource_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/renderer_context_menu/views/toolkit_delegate_views.h

diff --git a/components/renderer_context_menu/views/toolkit_delegate_views.h b/components/renderer_context_menu/views/toolkit_delegate_views.h

index b570958ff495ed06ba7987275a5ef8e6508c33f0..a5153d6f40d935a8e907a33c2c3b8f60bdf5230c 100644

--- a/components/renderer_context_menu/views/toolkit_delegate_views.h

+++ b/components/renderer_context_menu/views/toolkit_delegate_views.h

@@ -5,6 +5,8 @@

#ifndef COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_

#define COMPONENTS_RENDERER_CONTEXT_MENU_RENDER_TOOLKIT_DELEGATE_VIEWS_H_

+#include <memory>

#include "base/macros.h"

#include "components/renderer_context_menu/render_view_context_menu_base.h"

#include "ui/base/ui_base_types.h"

@@ -42,8 +44,8 @@ class ToolkitDelegateViews : public RenderViewContextMenuBase::ToolkitDelegate {

bool hidden,

const base::string16& title) override;

- scoped_ptr<views::MenuModelAdapter> menu_adapter_;

- scoped_ptr<views::MenuRunner> menu_runner_;

+ std::unique_ptr<views::MenuModelAdapter> menu_adapter_;

+ std::unique_ptr<views::MenuRunner> menu_runner_;

// Weak. Owned by menu_runner_;

views::MenuItemView* menu_view_;