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

Unified Diff: ash/shelf/shelf_layout_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_item_delegate_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index bfeda23c25bd4ad5703bc1d3a018ba36be79e6e2..e8e696add4bd63aabfb9992971becf1bd2c2417b 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -5,6 +5,7 @@
#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
#define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
+#include <memory>
#include <vector>
#include "ash/ash_export.h"
@@ -354,10 +355,10 @@ class ASH_EXPORT ShelfLayoutManager
// EventFilter used to detect when user moves the mouse over the shelf to
// trigger showing the shelf.
- scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_;
+ std::unique_ptr<AutoHideEventFilter> auto_hide_event_filter_;
// EventFilter used to detect when user issues a gesture on a bezel sensor.
- scoped_ptr<ShelfBezelEventFilter> bezel_event_filter_;
+ std::unique_ptr<ShelfBezelEventFilter> bezel_event_filter_;
base::ObserverList<ShelfLayoutManagerObserver> observers_;
« no previous file with comments | « ash/shelf/shelf_item_delegate_manager.cc ('k') | ash/shelf/shelf_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698