Index: ui/app_list/views/app_list_view.h |
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h |
index 4254b1eeaece76635c38643a71abceebedffec41..d283bb0269b6d5c66df082ad4ca1765c8832f7b4 100644 |
--- a/ui/app_list/views/app_list_view.h |
+++ b/ui/app_list/views/app_list_view.h |
@@ -5,9 +5,10 @@ |
#ifndef UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ |
#define UI_APP_LIST_VIEWS_APP_LIST_VIEW_H_ |
+#include <memory> |
+ |
#include "base/callback.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/observer_list.h" |
#include "build/build_config.h" |
#include "ui/app_list/app_list_export.h" |
@@ -184,7 +185,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView, |
views::View* overlay_view_; |
base::ObserverList<AppListViewObserver> observers_; |
- scoped_ptr<HideViewAnimationObserver> animation_observer_; |
+ std::unique_ptr<HideViewAnimationObserver> animation_observer_; |
// For UMA and testing. If non-null, triggered when the app list is painted. |
base::Closure next_paint_callback_; |