Index: ui/app_list/views/app_list_menu_views.h |
diff --git a/ui/app_list/views/app_list_menu_views.h b/ui/app_list/views/app_list_menu_views.h |
index 5fff0fba789ba4ab9cf6d62558031ebba5738355..131e68f90fb0d3b84c8e16b985becb8f750fc6e4 100644 |
--- a/ui/app_list/views/app_list_menu_views.h |
+++ b/ui/app_list/views/app_list_menu_views.h |
@@ -5,8 +5,9 @@ |
#ifndef UI_APP_LIST_VIEWS_APP_LIST_MENU_VIEWS_H_ |
#define UI_APP_LIST_VIEWS_APP_LIST_MENU_VIEWS_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "ui/app_list/app_list_menu.h" |
#include "ui/views/controls/menu/menu_model_adapter.h" |
#include "ui/views/controls/menu/menu_runner.h" |
@@ -33,9 +34,9 @@ class AppListMenuViews : public AppListMenu { |
private: |
// The context menu itself and its contents. |
- scoped_ptr<views::MenuModelAdapter> menu_delegate_; |
+ std::unique_ptr<views::MenuModelAdapter> menu_delegate_; |
views::MenuItemView* menu_; // Owned by menu_runner_. |
- scoped_ptr<views::MenuRunner> menu_runner_; |
+ std::unique_ptr<views::MenuRunner> menu_runner_; |
DISALLOW_COPY_AND_ASSIGN(AppListMenuViews); |
}; |