summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 14:38:08 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 14:38:08 +0000
commitb2fe07d168d4cb6395d5e265af9521305c320d92 (patch)
treea1524228b1dedbb4802678dee007c2df3fe24de4 /chrome/browser/browser.cc
parent0373b5e3eba9ebb93267536d4985ea9deccf3494 (diff)
downloadchromium_src-b2fe07d168d4cb6395d5e265af9521305c320d92.zip
chromium_src-b2fe07d168d4cb6395d5e265af9521305c320d92.tar.gz
chromium_src-b2fe07d168d4cb6395d5e265af9521305c320d92.tar.bz2
Do the remaining renames after http://codereview.chromium.org/585008
TBR=brettw TEST=you can possibly break the tree, right? BUG=none Review URL: http://codereview.chromium.org/602002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r--chrome/browser/browser.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 9fa5078..19580d7 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1106,7 +1106,7 @@ void Browser::ToggleEncodingAutoDetect() {
if (encoding_auto_detect_.GetValue()) {
TabContents* contents = GetSelectedTabContents();
if (contents)
- contents->reset_override_encoding();
+ contents->ResetOverrideEncoding();
}
}
@@ -1116,7 +1116,7 @@ void Browser::OverrideEncoding(int encoding_id) {
CharacterEncoding::GetCanonicalEncodingNameByCommandId(encoding_id);
TabContents* contents = GetSelectedTabContents();
if (!selected_encoding.empty() && contents)
- contents->override_encoding(selected_encoding);
+ contents->SetOverrideEncoding(selected_encoding);
// Update the list of recently selected encodings.
std::string new_selected_encoding_list;
if (CharacterEncoding::UpdateRecentlySelectdEncoding(