Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4321)

Unified Diff: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
index ed7550b5ba208024ec261e79226e73edfeb388b9..bd85155ebaac6db995d37429fe79dfd1d1a51f1e 100644
--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
@@ -7,8 +7,9 @@
#if defined(__OBJC__)
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "components/renderer_context_menu/context_menu_delegate.h"
#include "content/public/browser/web_contents_view_delegate.h"
@@ -38,19 +39,19 @@ class ChromeWebContentsViewDelegateMac
const content::ContextMenuParams& params) override;
// Overridden from ContextMenuDelegate.
- scoped_ptr<RenderViewContextMenuBase> BuildMenu(
+ std::unique_ptr<RenderViewContextMenuBase> BuildMenu(
content::WebContents* web_contents,
const content::ContextMenuParams& params) override;
- void ShowMenu(scoped_ptr<RenderViewContextMenuBase> menu) override;
+ void ShowMenu(std::unique_ptr<RenderViewContextMenuBase> menu) override;
private:
content::RenderWidgetHostView* GetActiveRenderWidgetHostView();
// The context menu. Callbacks are asynchronous so we need to keep it around.
- scoped_ptr<RenderViewContextMenuBase> context_menu_;
+ std::unique_ptr<RenderViewContextMenuBase> context_menu_;
// The chrome specific delegate that receives events from WebDragDestMac.
- scoped_ptr<WebDragBookmarkHandlerMac> bookmark_handler_;
+ std::unique_ptr<WebDragBookmarkHandlerMac> bookmark_handler_;
// The WebContents that owns the view.
content::WebContents* web_contents_;

Powered by Google App Engine
This is Rietveld 408576698