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/tools | |
| 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/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_webview_delegate.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_webview_delegate.cc b/webkit/tools/test_shell/test_webview_delegate.cc index 92959f6..e111877 100644 --- a/webkit/tools/test_shell/test_webview_delegate.cc +++ b/webkit/tools/test_shell/test_webview_delegate.cc @@ -508,7 +508,7 @@ void TestWebViewDelegate::ShowContextMenu(WebView* webview, const std::wstring& selection_text, const std::wstring& misspelled_word, int edit_flags, - const std::wstring& frame_encoding) { + const std::string& frame_encoding) { CapturedContextMenuEvent context(type, x, y); captured_context_menu_events_.push_back(context); } diff --git a/webkit/tools/test_shell/test_webview_delegate.h b/webkit/tools/test_shell/test_webview_delegate.h index e21ee53..ee1a4f9 100644 --- a/webkit/tools/test_shell/test_webview_delegate.h +++ b/webkit/tools/test_shell/test_webview_delegate.h @@ -116,7 +116,7 @@ class TestWebViewDelegate : public base::RefCounted<TestWebViewDelegate>, public const std::wstring& selection_text, const std::wstring& misspelled_word, int edit_flags, - const std::wstring& frame_encoding); + const std::string& frame_encoding); virtual void DidStartProvisionalLoadForFrame( WebView* webview, WebFrame* frame, |