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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups 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
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/app_list/cocoa/current_user_menu_item_view.mm ('k') | ui/app_list/cocoa/item_drag_controller.mm » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/cocoa/item_drag_controller.h
diff --git a/ui/app_list/cocoa/item_drag_controller.h b/ui/app_list/cocoa/item_drag_controller.h
index aaa87bcd012c8277a01cfb29f32499f355a19c71..4e1c74750c86454382f0a657c4837f8f40b7bb01 100644
--- a/ui/app_list/cocoa/item_drag_controller.h
+++ b/ui/app_list/cocoa/item_drag_controller.h
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
@class AppsGridViewItem;
@@ -19,8 +19,8 @@
// item location in the grid.
@interface ItemDragController : NSViewController {
@private
- scoped_nsobject<CALayer> dragLayer_;
- scoped_nsobject<NSButton> buttonToRestore_;
+ base::scoped_nsobject<CALayer> dragLayer_;
+ base::scoped_nsobject<NSButton> buttonToRestore_;
NSPoint mouseOffset_;
NSTimeInterval growStart_;
BOOL shrinking_;
« skia/ext/skia_utils_mac_unittest.mm ('K') | « ui/app_list/cocoa/current_user_menu_item_view.mm ('k') | ui/app_list/cocoa/item_drag_controller.mm » ('j') | webkit/common/cursors/webcursor_mac.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698