Index: ui/app_list/cocoa/app_list_view_controller.h |
diff --git a/ui/app_list/cocoa/app_list_view_controller.h b/ui/app_list/cocoa/app_list_view_controller.h |
index e0e1ad7883a1411c421616bca30c748c30bf878e..95d8708d1545c754535c855c9ef846a8e96b01d3 100644 |
--- a/ui/app_list/cocoa/app_list_view_controller.h |
+++ b/ui/app_list/cocoa/app_list_view_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" |
#import "ui/app_list/cocoa/apps_pagination_model_observer.h" |
@@ -30,11 +30,12 @@ APP_LIST_EXPORT |
AppsSearchBoxDelegate, |
AppsSearchResultsDelegate> { |
@private |
- scoped_nsobject<AppsGridController> appsGridController_; |
- scoped_nsobject<AppListPagerView> pagerControl_; |
- scoped_nsobject<AppsSearchBoxController> appsSearchBoxController_; |
- scoped_nsobject<AppsSearchResultsController> appsSearchResultsController_; |
- scoped_nsobject<NSView> contentsView_; |
+ base::scoped_nsobject<AppsGridController> appsGridController_; |
+ base::scoped_nsobject<AppListPagerView> pagerControl_; |
+ base::scoped_nsobject<AppsSearchBoxController> appsSearchBoxController_; |
+ base::scoped_nsobject<AppsSearchResultsController> |
+ appsSearchResultsController_; |
+ base::scoped_nsobject<NSView> contentsView_; |
scoped_ptr<app_list::AppListViewDelegate> delegate_; |
BOOL showingSearchResults_; |
} |