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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/app_list/cocoa/apps_collection_view_drag_manager.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/app_list_window_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_collection_view_drag_manager.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_collection_view_drag_manager.h
diff --git a/ui/app_list/cocoa/apps_collection_view_drag_manager.h b/ui/app_list/cocoa/apps_collection_view_drag_manager.h
index 79b77bbe2fa9c68314f1d8f30957ef03061a20e4..e8b5caf0079dc25fe4ecc7bcfc6933171d90ef6c 100644
--- a/ui/app_list/cocoa/apps_collection_view_drag_manager.h
+++ b/ui/app_list/cocoa/apps_collection_view_drag_manager.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/app_list/app_list_export.h"
@class AppsGridController;
@@ -19,7 +19,7 @@
APP_LIST_EXPORT
@interface AppsCollectionViewDragManager : NSObject {
@private
- scoped_nsobject<ItemDragController> itemDragController_;
+ base::scoped_nsobject<ItemDragController> itemDragController_;
AppsGridController* gridController_; // Weak. Owns us.
NSSize cellSize_;
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/app_list/cocoa/app_list_window_controller_unittest.mm ('k') | ui/app_list/cocoa/apps_collection_view_drag_manager.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698