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

Unified Diff: ash/shelf/shelf_item_delegate_manager.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc ('k') | ash/shelf/shelf_item_delegate_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_item_delegate_manager.h
diff --git a/ash/shelf/shelf_item_delegate_manager.h b/ash/shelf/shelf_item_delegate_manager.h
index 054e135120abf63cdb6e7a784a13f8c55e49be7c..3fb52edc3832281326677ed217fc21fb12076f8d 100644
--- a/ash/shelf/shelf_item_delegate_manager.h
+++ b/ash/shelf/shelf_item_delegate_manager.h
@@ -6,13 +6,13 @@
#define ASH_SHELF_SHELF_ITEM_DELEGATE_MANAGER_H_
#include <map>
+#include <memory>
#include "ash/ash_export.h"
#include "ash/shelf/shelf_item_types.h"
#include "ash/shelf/shelf_model_observer.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
namespace ash {
@@ -51,7 +51,7 @@ class ASH_EXPORT ShelfItemDelegateManager : public ShelfModelObserver {
// Set |item_delegate| for |id| and take an ownership.
void SetShelfItemDelegate(ShelfID id,
- scoped_ptr<ShelfItemDelegate> item_delegate);
+ std::unique_ptr<ShelfItemDelegate> item_delegate);
// Returns ShelfItemDelegate for |item_type|. Always returns non-NULL.
ShelfItemDelegate* GetShelfItemDelegate(ShelfID id);
« no previous file with comments | « ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc ('k') | ash/shelf/shelf_item_delegate_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698