diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 20:46:14 +0000 |
| commit | 13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5 (patch) | |
| tree | ada8d64cbd2fd12c7248cca648e47ebd63e6462a /views/controls/menu/menu_item_view_gtk.cc | |
| parent | cd4857b64f3e3b10ebfa3f44c38af0dc7376d5bb (diff) | |
| download | chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.zip chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.gz chromium_src-13658c4b2835a3155efa6eb2c3c6ff8fef2b7fa5.tar.bz2 | |
Change Font.GetStringWidth() to take string16 instead of wstring.
do a bunch of string fixes along the way.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/5985007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/menu_item_view_gtk.cc')
| -rw-r--r-- | views/controls/menu/menu_item_view_gtk.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/menu/menu_item_view_gtk.cc b/views/controls/menu/menu_item_view_gtk.cc index 73599e2..87fcdca 100644 --- a/views/controls/menu/menu_item_view_gtk.cc +++ b/views/controls/menu/menu_item_view_gtk.cc @@ -5,6 +5,7 @@ #include "views/controls/menu/menu_item_view.h" #include "app/resource_bundle.h" +#include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" #include "grit/app_resources.h" @@ -30,8 +31,8 @@ gfx::Size MenuItemView::GetPreferredSize() { // kFavIconSize if we're showing icons. int content_height = std::max(kFavIconSize, font.GetHeight()); return gfx::Size( - font.GetStringWidth(title_) + label_start_ + item_right_margin_ + - GetChildPreferredWidth(), + font.GetStringWidth(WideToUTF16Hack(title_)) + label_start_ + + item_right_margin_ + GetChildPreferredWidth(), content_height + GetBottomMargin() + GetTopMargin()); } |