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, 9 insertions, 2 deletions

diff --git a/chrome/browser/render_view_context_menu_controller.h b/chrome/browser/render_view_context_menu_controller.h
index f4cc15b..3817dd6 100644
--- a/chrome/browser/render_view_context_menu_controller.h
+++ b/chrome/browser/render_view_context_menu_controller.h
@@ -48,12 +48,19 @@ class RenderViewContextMenuController : public Menu::Delegate {
   virtual bool GetAcceleratorInfo(int id, ChromeViews::Accelerator* accel);
 
  private:
-  // Opens the specified URL string in a new tab.  If |in_current_window| is
-  // false, a new window is created to hold the new tab.
+  // Opens the specified URL string with a disposition specified by parameter
+  // |disposition|.
   void OpenURL(const GURL& url,
                WindowOpenDisposition disposition,
                PageTransition::Type transition);
 
+  // Opens the specified URL string with a disposition specified by parameter
+  // |disposition| and forces the new page on using |override_encoding|.
+  void OpenURLWithOverrideEncoding(const GURL& url,
+                                   WindowOpenDisposition disposition,
+                                   PageTransition::Type transition,
+                                   const std::wstring& override_encoding);
+
   // Copy to the clipboard an image located at a point in the RenderView
   void CopyImageAt(int x, int y);