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

Unified Diff: chrome/browser/ui/cocoa/download/download_item_controller.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/download/download_item_controller.h
diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.h b/chrome/browser/ui/cocoa/download/download_item_controller.h
index 91fab101492d635215d0e15cbcfa9d3c38e3347d..c7ec0a21f35cf789badc6af6dd42a1cd910f8edb 100644
--- a/chrome/browser/ui/cocoa/download/download_item_controller.h
+++ b/chrome/browser/ui/cocoa/download/download_item_controller.h
@@ -4,7 +4,8 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
#include "base/time/time.h"
@class ChromeUILocalizer;
@@ -93,8 +94,8 @@ class MenuModel;
IBOutlet NSImageView* image_;
- scoped_ptr<DownloadItemMac> bridge_;
- scoped_ptr<DownloadShelfContextMenuMac> menuBridge_;
+ std::unique_ptr<DownloadItemMac> bridge_;
+ std::unique_ptr<DownloadShelfContextMenuMac> menuBridge_;
// Weak pointer to the shelf that owns us.
DownloadShelfController* shelf_;
@@ -103,7 +104,7 @@ class MenuModel;
base::Time creationTime_;
// Default font list to use for text metrics.
- scoped_ptr<gfx::FontList> font_list_;
+ std::unique_ptr<gfx::FontList> font_list_;
// The state of this item.
enum DownloadItemState {
@@ -113,7 +114,7 @@ class MenuModel;
// ExperienceSampling: This tracks dangerous/malicious downloads warning UI
// and the user's decisions about it.
- scoped_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
+ std::unique_ptr<extensions::ExperienceSamplingEvent> sampling_event_;
};
// Initialize controller for |downloadItem|.

Powered by Google App Engine
This is Rietveld 408576698