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

Unified Diff: ui/app_list/cocoa/apps_search_box_controller.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/app_list/cocoa/apps_grid_view_item.h ('k') | ui/app_list/cocoa/apps_search_results_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/apps_search_box_controller.h
diff --git a/ui/app_list/cocoa/apps_search_box_controller.h b/ui/app_list/cocoa/apps_search_box_controller.h
index b8a86e57f7b9dc022c5cc11c0718db028d8b3198..553ba9874583e5dab28d1efbaa2a42a99be7069f 100644
--- a/ui/app_list/cocoa/apps_search_box_controller.h
+++ b/ui/app_list/cocoa/apps_search_box_controller.h
@@ -7,8 +7,9 @@
#import <Cocoa/Cocoa.h>
+#include <memory>
+
#include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/app_list/app_list_export.h"
namespace app_list {
@@ -40,8 +41,8 @@ APP_LIST_EXPORT
base::scoped_nsobject<NSImageView> searchImageView_;
base::scoped_nsobject<HoverImageMenuButton> menuButton_;
base::scoped_nsobject<AppListMenuController> menuController_;
- scoped_ptr<app_list::SearchBoxModelObserverBridge> bridge_;
- scoped_ptr<app_list::AppListMenu> appListMenu_;
+ std::unique_ptr<app_list::SearchBoxModelObserverBridge> bridge_;
+ std::unique_ptr<app_list::AppListMenu> appListMenu_;
id<AppsSearchBoxDelegate> delegate_; // Weak. Owns us.
}
« no previous file with comments | « ui/app_list/cocoa/apps_grid_view_item.h ('k') | ui/app_list/cocoa/apps_search_results_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698