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

Unified Diff: chrome/browser/ui/cocoa/menu_button.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
Index: chrome/browser/ui/cocoa/menu_button.h
diff --git a/chrome/browser/ui/cocoa/menu_button.h b/chrome/browser/ui/cocoa/menu_button.h
index b2de8de1cb4b431ecef61dcb3af9e0c6096caee4..d0ffb589ddb1960af0ee9bfaa1f00384e9e4fdad 100644
--- a/chrome/browser/ui/cocoa/menu_button.h
+++ b/chrome/browser/ui/cocoa/menu_button.h
@@ -7,7 +7,7 @@
#import <Cocoa/Cocoa.h>
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/toolbar/toolbar_button.h"
// This a button which displays a user-provided menu "attached" below it upon
@@ -24,10 +24,10 @@
// value is NO so that custom actions can be hooked up in Interface Builder.
@interface MenuButton : ToolbarButton {
@private
- scoped_nsobject<NSMenu> attachedMenu_;
+ base::scoped_nsobject<NSMenu> attachedMenu_;
BOOL openMenuOnClick_;
BOOL openMenuOnRightClick_;
- scoped_nsobject<NSPopUpButtonCell> popUpCell_;
+ base::scoped_nsobject<NSPopUpButtonCell> popUpCell_;
}
// The menu to display. Note that it should have no (i.e., a blank) title and

Powered by Google App Engine
This is Rietveld 408576698