3 files changed, 6 insertions, 6 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(
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index db631f6..f3b986d 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -1205,12 +1205,12 @@ bool TabContents::IsActiveEntry(int32 page_id) {
           active_entry->page_id() == page_id);
 }
 
-void TabContents::override_encoding(const std::string& encoding) {
+void TabContents::SetOverrideEncoding(const std::string& encoding) {
   set_encoding(encoding);
   render_view_host()->SetPageEncoding(encoding);
 }
 
-void TabContents::reset_override_encoding() {
+void TabContents::ResetOverrideEncoding() {
   reset_encoding();
   render_view_host()->ResetPageEncodingToDefault();
 }
diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index c8271c8..eabbb71e 100644
--- a/chrome/browser/tab_contents/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -602,11 +602,11 @@ class TabContents : public PageNavigator,
   // the opposite of this, by which 'browser' is notified of
   // the encoding of the current tab from 'renderer' (determined by
   // auto-detect, http header, meta, bom detection, etc).
-  void override_encoding(const std::string& encoding);
+  void SetOverrideEncoding(const std::string& encoding);
 
   // Remove any user-defined override encoding and reload by sending down
   // ViewMsg_ResetPageEncodingToDefault to the renderer.
-  void reset_override_encoding();
+  void ResetOverrideEncoding();
 
   void WindowMoveOrResizeStarted();