| 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
|
|
|