diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 21:43:00 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 21:43:00 +0000 |
| commit | f527d9cdabd11282598dc769fa32ed9490c877d9 (patch) | |
| tree | 3387e648f4cf2b95402a68fef36f60d1738752ff /ui/base | |
| parent | 42303816401b4b75fb221c6e59d423fd2ec32f5d (diff) | |
| download | chromium_src-f527d9cdabd11282598dc769fa32ed9490c877d9.zip chromium_src-f527d9cdabd11282598dc769fa32ed9490c877d9.tar.gz chromium_src-f527d9cdabd11282598dc769fa32ed9490c877d9.tar.bz2 | |
Remove 'using base::string16;' from base/strings/string16.h and remove temporary
PRESUBMIT.py _CheckForString16().
R=brettw@chromium.org, maruel@chromium.org
TBR=sky@chromium.org, tsepez@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/93903011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -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); |