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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cocoa/controls/hover_image_menu_button_cell.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/base/cocoa/base_view_unittest.mm ('k') | ui/base/cocoa/controls/hover_image_menu_button_cell.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/controls/hover_image_menu_button_cell.h
diff --git a/ui/base/cocoa/controls/hover_image_menu_button_cell.h b/ui/base/cocoa/controls/hover_image_menu_button_cell.h
index 1da338b0e207d26a76116852b018712155bffe43..fad48fe2e5368b94ab7553a096e617bbe20d38e6 100644
--- a/ui/base/cocoa/controls/hover_image_menu_button_cell.h
+++ b/ui/base/cocoa/controls/hover_image_menu_button_cell.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "ui/base/ui_export.h"
// A custom NSPopUpButtonCell that permits a hover image, and draws only an
@@ -17,7 +17,7 @@
UI_EXPORT
@interface HoverImageMenuButtonCell : NSPopUpButtonCell {
@private
- scoped_nsobject<NSImage> hoverImage_;
+ base::scoped_nsobject<NSImage> hoverImage_;
BOOL hovered_;
}
« content/browser/renderer_host/webmenurunner_mac.mm ('K') | « ui/base/cocoa/base_view_unittest.mm ('k') | ui/base/cocoa/controls/hover_image_menu_button_cell.mm » ('j') | ui/base/cocoa/menu_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698