| Index: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
|
| diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
|
| index 983ae5277981a11df6b259b985356e3249b5d51b..aab0fa06feb40f622236794b9665960bb63641cb 100644
|
| --- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
|
| +++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm
|
| @@ -57,7 +57,7 @@ void ChromeWebContentsViewDelegateMac::ShowContextMenu(
|
| }
|
|
|
| void ChromeWebContentsViewDelegateMac::ShowMenu(
|
| - scoped_ptr<RenderViewContextMenuBase> menu) {
|
| + std::unique_ptr<RenderViewContextMenuBase> menu) {
|
| // TODO(erikchen): Remove ScopedTracker below once crbug.com/458401 is fixed.
|
| tracked_objects::ScopedTracker tracking_profile(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| @@ -81,7 +81,7 @@ void ChromeWebContentsViewDelegateMac::ShowMenu(
|
| context_menu_->Show();
|
| }
|
|
|
| -scoped_ptr<RenderViewContextMenuBase>
|
| +std::unique_ptr<RenderViewContextMenuBase>
|
| ChromeWebContentsViewDelegateMac::BuildMenu(
|
| content::WebContents* web_contents,
|
| const content::ContextMenuParams& params) {
|
| @@ -89,7 +89,7 @@ ChromeWebContentsViewDelegateMac::BuildMenu(
|
| tracked_objects::ScopedTracker tracking_profile1(
|
| FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| "458401 ChromeWebContentsViewDelegateMac::BuildMenu"));
|
| - scoped_ptr<RenderViewContextMenuBase> menu;
|
| + std::unique_ptr<RenderViewContextMenuBase> menu;
|
| content::RenderFrameHost* focused_frame = web_contents->GetFocusedFrame();
|
| // If the frame tree does not have a focused frame at this point, do not
|
| // bother creating RenderViewContextMenuMac.
|
|
|