summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_contents.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/web_contents.h')
-rw-r--r--chrome/browser/web_contents.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/chrome/browser/web_contents.h b/chrome/browser/web_contents.h
index 054c57e..fd12b9b 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/web_contents.h
@@ -93,7 +93,7 @@ class WebContents : public TabContents,
virtual void AlterTextSize(text_zoom::TextSize size);
// Change encoding of page.
- virtual void SetPageEncoding(const std::string& encoding_name);
+ virtual void SetPageEncoding(const std::wstring& encoding_name);
bool is_starred() const { return is_starred_; }
@@ -323,10 +323,6 @@ 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::string& override_encoding) {
- override_encoding_ = override_encoding;
- }
-
protected:
FRIEND_TEST(WebContentsTest, OnMessageReceived);
@@ -358,7 +354,7 @@ class WebContents : public TabContents,
int32 page_id,
const std::wstring& title);
virtual void UpdateEncoding(RenderViewHost* render_view_host,
- const std::string& encoding_name);
+ const std::wstring& encoding_name);
virtual void UpdateTargetURL(int32 page_id, const GURL& url);
virtual void UpdateThumbnail(const GURL& url,
const SkBitmap& bitmap,
@@ -757,9 +753,6 @@ 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::string override_encoding_;
-
DISALLOW_COPY_AND_ASSIGN(WebContents);
};