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

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

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.h
diff --git a/ui/app_list/cocoa/apps_search_box_controller.h b/ui/app_list/cocoa/apps_search_box_controller.h
index f373235b576d61cc37056ef6c6c1413b08d5f177..3e9b4b2dc8a97aba5ad7706a5c259be3bda386d7 100644
--- a/ui/app_list/cocoa/apps_search_box_controller.h
+++ b/ui/app_list/cocoa/apps_search_box_controller.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "ui/app_list/app_list_export.h"
@@ -34,10 +34,10 @@ class SearchBoxModelObserverBridge;
APP_LIST_EXPORT
@interface AppsSearchBoxController : NSViewController<NSTextFieldDelegate> {
@private
- scoped_nsobject<SearchTextField> searchTextField_;
- scoped_nsobject<NSImageView> searchImageView_;
- scoped_nsobject<HoverImageMenuButton> menuButton_;
- scoped_nsobject<AppListMenuController> menuController_;
+ base::scoped_nsobject<SearchTextField> searchTextField_;
+ 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_;

Powered by Google App Engine
This is Rietveld 408576698