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

1 files changed, 4 insertions, 10 deletions

diff --git a/chrome/browser/tab_contents.h b/chrome/browser/tab_contents.h
index b079eeb..a8eaec3 100644
--- a/chrome/browser/tab_contents.h
+++ b/chrome/browser/tab_contents.h
@@ -258,7 +258,7 @@ class TabContents : public PageNavigator,
   virtual void SetEncodingAutoDetector(bool encoding_auto_detector) { }
 
   // Asynchronous call to change page encoding.
-  virtual void SetPageEncoding(const std::string& encoding_name) { }
+  virtual void SetPageEncoding(const std::wstring& encoding_name) { }
 
   // Return whether this tab contents is loading a resource.
   bool is_loading() const { return is_loading_; }
@@ -347,12 +347,6 @@ class TabContents : public PageNavigator,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition);
 
-  virtual void OpenURLWithOverrideEncoding(
-      const GURL& url,
-      WindowOpenDisposition disposition,
-      PageTransition::Type transition,
-      const std::string& override_encoding);
-
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -411,8 +405,8 @@ class TabContents : public PageNavigator,
   // Returns a human-readable description the tab's loading state.
   virtual std::wstring GetStatusText() const { return std::wstring(); }
 
-  const std::string& GetEncoding() { return encoding_name_; }
-  void SetEncoding(const std::string& encoding_name) {
+  const std::wstring& GetEncoding() { return encoding_name_; }
+  void SetEncoding(const std::wstring& encoding_name) {
     encoding_name_ = encoding_name;
   }
 
@@ -540,7 +534,7 @@ class TabContents : public PageNavigator,
   // The id used in the ViewStorage to store the last focused view.
   int last_focused_view_storage_id_;
 
-  std::string encoding_name_;
+  std::wstring encoding_name_;
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_H_