Reorganize the declarations to have some grouping and logical ordering in tab...

chrome/browser/encoding_menu_controller_delegate.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/encoding_menu_controller_delegate.h"
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
@@ skipping 10 matching lines @@
       browser_(browser) {
 }
 
 bool EncodingMenuControllerDelegate::IsItemChecked(int id) const {
   Profile* profile = browser_->profile();
   if (!profile)
     return false;
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (!current_tab)
     return false;
-  std::wstring encoding_name = current_tab->GetEncoding();
+  std::wstring encoding_name = current_tab->encoding();
   if (encoding_name.empty())
     encoding_name = profile->GetPrefs()->GetString(prefs::kDefaultCharset);
   switch (id) {
     case IDC_ENCODING_AUTO_DETECT:
       return profile->GetPrefs()->GetBoolean(
           prefs::kWebKitUsesUniversalDetector);
     case IDC_ENCODING_UTF8:
     case IDC_ENCODING_UTF16LE:
     case IDC_ENCODING_ISO88591:
     case IDC_ENCODING_WINDOWS1252:
@@ skipping 68 matching lines @@
       if (l10n_util::AdjustStringForLocaleDirection(encoding,
                                                     &bidi_safe_encoding))
         encoding.swap(bidi_safe_encoding);
       encoding_menu->AppendMenuItem(*it, encoding, Menu::RADIO);
     }
     else
       encoding_menu->AppendSeparator();
   }
 }