diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:08:30 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-12 23:08:30 +0000 |
| commit | e38f40150dac6e0af08e3cdcfb1e502a2223c87c (patch) | |
| tree | 3b31c4c506ac390d712921ae35acad89f7afd5d7 /webkit/glue/context_menu_client_impl.cc | |
| parent | 5baa03fdfe3a13d4102a819fb3e653f1559b5259 (diff) | |
| download | chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.zip chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.tar.gz chromium_src-e38f40150dac6e0af08e3cdcfb1e502a2223c87c.tar.bz2 | |
Revert the change that fixed the encoding when viewing source in subframes.
This makes view source for some pages (for example Google Reader) not work
properly. I speculate that telling WebKit to change the encoding (which causes
a reload) right after starting the real load makes it confused.
Review URL: http://codereview.chromium.org/3022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2143 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 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc index 03e32f5..58f2e78 100644 --- a/webkit/glue/context_menu_client_impl.cc +++ b/webkit/glue/context_menu_client_impl.cc @@ -159,7 +159,7 @@ WebCore::PlatformMenuDescription GURL frame_url; GURL page_url; - std::string frame_encoding; + std::wstring frame_encoding; // Send the frame and page URLs in any case. ContextNode::Type frame_type = ContextNode::NONE; ContextNode::Type page_type = @@ -170,8 +170,8 @@ WebCore::PlatformMenuDescription frame_type = GetTypeAndURLFromFrame(selected_frame, &frame_url, ContextNode::FRAME); - frame_encoding = WideToUTF8( - webkit_glue::StringToStdWString(selected_frame->loader()->encoding())); + frame_encoding = webkit_glue::StringToStdWString( + selected_frame->loader()->encoding()); } if (type == ContextNode::NONE) { @@ -222,8 +222,7 @@ WebCore::PlatformMenuDescription frame_url, selection_text_string, misspelled_word_string, - edit_flags, - frame_encoding); + edit_flags); } return NULL; } |