The CL is consist of CLs(1624,1580) for bug:1281734 which are reviewed and LG by brett. I just merge them to single one for passing compilation.

The CL is to fix bug http://b/issue?id=1281734. FireFox uses encoding used by the original webpage to decode the source of the webpage, Chrome does not. We need to add a new parameter which carries the override encoding when opening a view-source URL for viewing its source.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@997 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index 8beb013..5ef5cd0 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -175,6 +175,9 @@ struct ViewHostMsg_ContextMenu_Params {
   // These flags indicate to the browser whether the renderer believes it is
   // able to perform the corresponding action.
   int edit_flags;
+
+  // |frame_encoding|indicates the encoding of current focused sub frame.
+  std::wstring frame_encoding;
 };
 
 // Values that may be OR'd together to form the 'flags' parameter of a
@@ -791,6 +794,7 @@ struct ParamTraits<ViewHostMsg_ContextMenu_Params> {
     WriteParam(m, p.misspelled_word);
     WriteParam(m, p.dictionary_suggestions);
     WriteParam(m, p.edit_flags);
+    WriteParam(m, p.frame_encoding);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return
@@ -804,7 +808,8 @@ struct ParamTraits<ViewHostMsg_ContextMenu_Params> {
       ReadParam(m, iter, &p->selection_text) &&
       ReadParam(m, iter, &p->misspelled_word) &&
       ReadParam(m, iter, &p->dictionary_suggestions) &&
-      ReadParam(m, iter, &p->edit_flags);
+      ReadParam(m, iter, &p->edit_flags) &&
+      ReadParam(m, iter, &p->frame_encoding);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"<ViewHostMsg_ContextMenu_Params>");