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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/app_list/cocoa/apps_grid_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
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/apps_collection_view_drag_manager.mm ('k') | ui/app_list/cocoa/apps_grid_controller.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/apps_grid_controller.h
diff --git a/ui/app_list/cocoa/apps_grid_controller.h b/ui/app_list/cocoa/apps_grid_controller.h
index 7db9fbf4bbb401c3dbe1b283f55005599304442c..7b3db09e255cc06d8c46a1078c7059fd5bdb67b6 100644
--- a/ui/app_list/cocoa/apps_grid_controller.h
+++ b/ui/app_list/cocoa/apps_grid_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/app_list_pager_view.h"
@@ -32,10 +32,10 @@ APP_LIST_EXPORT
app_list::AppListViewDelegate* delegate_; // Weak. Owned by view controller.
scoped_ptr<app_list::AppsGridDelegateBridge> bridge_;
- scoped_nsobject<AppsCollectionViewDragManager> dragManager_;
- scoped_nsobject<NSMutableArray> pages_;
- scoped_nsobject<NSMutableArray> items_;
- scoped_nsobject<NSTimer> scrollWhileDraggingTimer_;
+ base::scoped_nsobject<AppsCollectionViewDragManager> dragManager_;
+ base::scoped_nsobject<NSMutableArray> pages_;
+ base::scoped_nsobject<NSMutableArray> items_;
+ base::scoped_nsobject<NSTimer> scrollWhileDraggingTimer_;
id<AppsPaginationModelObserver> paginationObserver_;
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/apps_collection_view_drag_manager.mm ('k') | ui/app_list/cocoa/apps_grid_controller.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698