diff options
| author | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
|---|---|---|
| committer | jnd@google.com <jnd@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 02:58:09 +0000 |
| commit | 1a3ebe10ead2ca99d2beb45b9ec65a2863406184 (patch) | |
| tree | b1c8b11cc0a32e1f561362ecee1b488bf7d91b15 /webkit/glue/context_menu_client_impl.cc | |
| parent | aef050626d6412bffa292cbfcee23107cadc4b5d (diff) | |
| download | chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.zip chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.gz chromium_src-1a3ebe10ead2ca99d2beb45b9ec65a2863406184.tar.bz2 | |
As Brett pointed it out, We normally use 8-bit for encoding names since they're always ASCII. Plus, wstrings will also be 32-bit characters on Linux and Mac, which is expensive. So I make this CL by using std::string instead of std::wstring every time you have an encoding name.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/context_menu_client_impl.cc')
| -rw-r--r-- | webkit/glue/context_menu_client_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index ea6d800..1db2c18 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -184,7 +184,7 @@ WebCore::PlatformMenuDescription GURL frame_url; GURL page_url; - std::wstring frame_encoding; + std::string frame_encoding; // Send the frame and page URLs in any case. ContextNode::Type frame_type = ContextNode::NONE; ContextNode::Type page_type = @@ -195,8 +195,8 @@ WebCore::PlatformMenuDescription frame_type = GetTypeAndURLFromFrame(selected_frame, &frame_url, ContextNode::FRAME); - frame_encoding = webkit_glue::StringToStdWString( - selected_frame->loader()->encoding()); + frame_encoding = WideToUTF8( + webkit_glue::StringToStdWString(selected_frame->loader()->encoding())); } if (type == ContextNode::NONE) { |