diff options
author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:46:44 +0000 |
---|---|---|
committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:46:44 +0000 |
commit | 1d681e90e2a061a81262b0c6b55b8ac8e6fb4d60 (patch) | |
tree | bf0dfe939974792d2c9abacb5a3762f33fbc310a | |
parent | 5f1de78d8a5fb09486ba06121558ddb8124ab1bb (diff) | |
download | chromium_src-1d681e90e2a061a81262b0c6b55b8ac8e6fb4d60.zip chromium_src-1d681e90e2a061a81262b0c6b55b8ac8e6fb4d60.tar.gz chromium_src-1d681e90e2a061a81262b0c6b55b8ac8e6fb4d60.tar.bz2 |
Merge 35197 - Fix utf8 issue in extension action context menu.
BUG=29538
TEST=Extensions with utf8 encoded names should appear correctly named in the context menu.
Review URL: http://codereview.chromium.org/520001
TBR=finnur@chromium.org
Review URL: http://codereview.chromium.org/515020
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@35242 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/extensions/extension_action_context_menu_model.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_action_context_menu_model.cc b/chrome/browser/extensions/extension_action_context_menu_model.cc index 92ee2ad..9e22aa6 100644 --- a/chrome/browser/extensions/extension_action_context_menu_model.cc +++ b/chrome/browser/extensions/extension_action_context_menu_model.cc @@ -27,7 +27,7 @@ ExtensionActionContextMenuModel::ExtensionActionContextMenuModel( : ALLOW_THIS_IN_INITIALIZER_LIST(SimpleMenuModel(this)), extension_(extension), delegate_(delegate) { - AddItem(NAME, ASCIIToUTF16(extension->name())); + AddItem(NAME, UTF8ToUTF16(extension->name())); AddSeparator(); AddItemWithStringId(CONFIGURE, IDS_EXTENSIONS_OPTIONS); AddItemWithStringId(DISABLE, IDS_EXTENSIONS_DISABLE); |