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, 7 insertions, 0 deletions

diff --git a/chrome/browser/web_contents.h b/chrome/browser/web_contents.h
index 09a07d0..865cfab 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/web_contents.h
@@ -359,6 +359,10 @@ class WebContents : public TabContents,
   // Returns true if this WebContents will notify about disconnection.
   bool notify_disconnection() const { return notify_disconnection_; }
 
+  void set_override_encoding(const std::wstring& override_encoding) {
+    override_encoding_ = override_encoding;
+  }
+
  protected:
   FRIEND_TEST(WebContentsTest, OnMessageReceived);
 
@@ -822,6 +826,9 @@ class WebContents : public TabContents,
   // Non-null if we're displaying content for a web app.
   scoped_refptr<WebApp> web_app_;
 
+  // Specified encoding which is used to override current tab's encoding.
+  std::wstring override_encoding_;
+
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };