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

Unified Diff: ui/base/cocoa/menu_controller.mm

Issue 93903011: Remove 'using base::string16;' from base/strings/string16.h and remove temporary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: asdf Created 7 years 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
« no previous file with comments | « ui/base/cocoa/menu_controller.h ('k') | ui/message_center/cocoa/notification_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/menu_controller.mm
diff --git a/ui/base/cocoa/menu_controller.mm b/ui/base/cocoa/menu_controller.mm
index 787f1710274672d9abcb98883fe6aea1a1ddef89..8f03d0fc9a96855f42841b5f92eb6d6050ea5ee9 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);
« no previous file with comments | « ui/base/cocoa/menu_controller.h ('k') | ui/message_center/cocoa/notification_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698