Fix for bug 2932: Chrome should not trigger page reloading when turn off auto detect

In order to fix the bug I added new interfaces to allow resetting the override encoding (including a new render message). 

The new logic is as follows: 

-) If the user turns auto-detect OFF, nothing happens (as requested in the bug description) 
-) If the user turns auto-detect ON, then the page is reloaded with an empty override encoding 

I.e., turning auto-detect on resets a previous override setting. 
The reverse is not true, however: specifiying a new override setting will not turn auto-detect off. 


BUG=2932
TEST=do the following steps, using the test file (encoding-gb18030.htm) attached to comment 14 of the original bug http://crbug.com/2932 : 

1.) load the file while auto-detect is turned off 
-> garbage is displayed 
2.) turn auto-detect on 
-> proper Chinese text should appear 
-> in the encoding menu, Chinese encoding should be highlighted 
3.) turn auto-detect off 
-> proper Chinese text should remain 
-> in the encoding menu, Chinese encoding should remain highlighted 
4.) choose any other encoding 
-> garbage is again displayed (in the new encoding) 
5.) turn auto-detect on 
-> proper Chinese text should again appear 
-> in the encoding menu, Chinese should again be highlighted 

Original Review: http://codereview.chromium.org/173265
Patch by Roland Steiner (rolandsteiner@google.com)


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

2 files changed, 8 insertions, 0 deletions

diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 099cd1e..f339309 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -373,6 +373,8 @@ void RenderView::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_DeterminePageText, OnDeterminePageText)
     IPC_MESSAGE_HANDLER(ViewMsg_Zoom, OnZoom)
     IPC_MESSAGE_HANDLER(ViewMsg_SetPageEncoding, OnSetPageEncoding)
+    IPC_MESSAGE_HANDLER(ViewMsg_ResetPageEncodingToDefault,
+                        OnResetPageEncodingToDefault)
     IPC_MESSAGE_HANDLER(ViewMsg_SetupDevToolsClient, OnSetupDevToolsClient)
     IPC_MESSAGE_HANDLER(ViewMsg_DownloadFavIcon, OnDownloadFavIcon)
     IPC_MESSAGE_HANDLER(ViewMsg_ScriptEvalRequest, OnScriptEvalRequest)
@@ -2659,6 +2661,11 @@ void RenderView::OnSetPageEncoding(const std::string& encoding_name) {
   webview()->SetPageEncoding(encoding_name);
 }
 
+void RenderView::OnResetPageEncodingToDefault() {
+  std::string no_encoding;
+  webview()->SetPageEncoding(no_encoding);
+}
+
 void RenderView::NavigateBackForwardSoon(int offset) {
   history_back_list_count_ += offset;
   history_forward_list_count_ -= offset;
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f9d3784..5836b52 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -557,6 +557,7 @@ class RenderView : public RenderWidget,
   void OnDeterminePageText();
   void OnZoom(int function);
   void OnSetPageEncoding(const std::string& encoding_name);
+  void OnResetPageEncodingToDefault();
   void OnGetAllSavableResourceLinksForCurrentPage(const GURL& page_url);
   void OnGetSerializedHtmlDataForCurrentPageWithLocalLinks(
       const std::vector<GURL>& links,