diff options
Diffstat (limited to 'ui/base/cocoa')
| -rw-r--r-- | ui/base/cocoa/menu_controller.h | 4 | ||||
| -rw-r--r-- | ui/base/cocoa/menu_controller.mm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/cocoa/menu_controller.h b/ui/base/cocoa/menu_controller.h index 2082ab3..b8d8ed0 100644 --- a/ui/base/cocoa/menu_controller.h +++ b/ui/base/cocoa/menu_controller.h @@ -35,8 +35,8 @@ UI_EXPORT // |-initWithModel:useWithPopUpButtonCell:| or after the first call to |-menu|. @property(nonatomic) BOOL useWithPopUpButtonCell; -+ (string16)elideMenuTitle:(const base::string16&)title - toWidth:(int)width; ++ (base::string16)elideMenuTitle:(const base::string16&)title + toWidth:(int)width; // NIB-based initializer. This does not create a menu. Clients can set the // properties of the object and the menu will be created upon the first call to diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm index 787f171..8f03d0f 100644 --- a/ui/base/cocoa/menu_controller.mm +++ b/ui/base/cocoa/menu_controller.mm @@ -25,8 +25,8 @@ @synthesize model = model_; @synthesize useWithPopUpButtonCell = useWithPopUpButtonCell_; -+ (string16)elideMenuTitle:(const base::string16&)title - toWidth:(int)width { ++ (base::string16)elideMenuTitle:(const base::string16&)title + toWidth:(int)width { NSFont* nsfont = [NSFont menuBarFontOfSize:0]; // 0 means "default" return gfx::ElideText(title, gfx::FontList(gfx::Font(nsfont)), width, gfx::ELIDE_AT_END); |