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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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
Index: ui/app_list/cocoa/apps_search_box_controller.mm
diff --git a/ui/app_list/cocoa/apps_search_box_controller.mm b/ui/app_list/cocoa/apps_search_box_controller.mm
index 534a0645243d6722e9147e37f6682104a13e5709..0456c161f0fa0d72867fb72f99ecfb39837440f4 100644
--- a/ui/app_list/cocoa/apps_search_box_controller.mm
+++ b/ui/app_list/cocoa/apps_search_box_controller.mm
@@ -139,7 +139,8 @@ void SearchBoxModelObserverBridge::TextChanged() {
- (id)initWithFrame:(NSRect)frame {
if ((self = [super init])) {
- scoped_nsobject<NSView> containerView([[NSView alloc] initWithFrame:frame]);
+ base::scoped_nsobject<NSView> containerView(
+ [[NSView alloc] initWithFrame:frame]);
[self setView:containerView];
[self addSubviews];
}
@@ -370,7 +371,7 @@ void SearchBoxModelObserverBridge::TextChanged() {
if (model->GetCommandIdAt(index) != app_list::AppListMenu::CURRENT_USER)
return;
- scoped_nsobject<NSView> customItemView([[CurrentUserMenuItemView alloc]
+ base::scoped_nsobject<NSView> customItemView([[CurrentUserMenuItemView alloc]
initWithDelegate:[[searchBoxController_ delegate] appListDelegate]]);
[[menu itemAtIndex:index] setView:customItemView];
}

Powered by Google App Engine
This is Rietveld 408576698