Index: ui/app_list/views/search_result_view.h |
diff --git a/ui/app_list/views/search_result_view.h b/ui/app_list/views/search_result_view.h |
index d3da9f4f11ff40361bb9894c892422c2751fab9a..9c4594e832a6675f5790a0284136e98e3e643b8a 100644 |
--- a/ui/app_list/views/search_result_view.h |
+++ b/ui/app_list/views/search_result_view.h |
@@ -7,12 +7,12 @@ |
#include <stddef.h> |
+#include <memory> |
#include <string> |
#include <vector> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/strings/string16.h" |
#include "ui/app_list/search_result_observer.h" |
#include "ui/app_list/views/search_result_actions_view_delegate.h" |
@@ -116,12 +116,12 @@ class APP_LIST_EXPORT SearchResultView |
views::ImageView* icon_; // Owned by views hierarchy. |
views::ImageView* badge_icon_; // Owned by views hierarchy. |
- scoped_ptr<gfx::RenderText> title_text_; |
- scoped_ptr<gfx::RenderText> details_text_; |
+ std::unique_ptr<gfx::RenderText> title_text_; |
+ std::unique_ptr<gfx::RenderText> details_text_; |
SearchResultActionsView* actions_view_; // Owned by the views hierarchy. |
ProgressBarView* progress_bar_; // Owned by views hierarchy. |
- scoped_ptr<views::MenuRunner> context_menu_runner_; |
+ std::unique_ptr<views::MenuRunner> context_menu_runner_; |
DISALLOW_COPY_AND_ASSIGN(SearchResultView); |
}; |