Remove text encoding UI

chrome/browser/ui/cocoa/browser_window_command_handler.mm

 // Copyright 2015 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_command_handler.h"
 
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
-#include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #import "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
@@ skipping 22 matching lines @@
   if (tag == IDC_SHOW_BOOKMARK_BAR) {
     SetToggleState(browser->window()->IsBookmarkBarVisible(), item);
     return;
   }
 
   if (tag == IDC_TOGGLE_FULLSCREEN_TOOLBAR) {
     PrefService* prefs = browser->profile()->GetPrefs();
     SetToggleState(prefs->GetBoolean(prefs::kShowFullscreenToolbar), item);
     return;
   }
-
-  // Update the checked/unchecked state of items in the encoding menu.
-  // On Windows, this logic is part of |EncodingMenuModel| in
-  // browser/ui/views/toolbar_view.h.
-  EncodingMenuController encoding_controller;
-  if (!encoding_controller.DoesCommandBelongToEncodingMenu(tag))
-    return;
-
-  Profile* profile = browser->profile();
-  DCHECK(profile);
-  content::WebContents* current_tab =
-      browser->tab_strip_model()->GetActiveWebContents();
-  if (!current_tab)
-    return;
-
-  const std::string encoding = current_tab->GetEncoding();
-
-  SetToggleState(encoding_controller.IsItemChecked(profile, encoding, tag),
-                 item);
 }
 
 NSString* GetTitleForViewsFullscreenMenuItem(Browser* browser) {
   return l10n_util::GetNSString(browser->window()->IsFullscreen()
                                     ? IDS_EXIT_FULLSCREEN_MAC
                                     : IDS_ENTER_FULLSCREEN_MAC);
 }
 
 // Get the text for the "Enter/Exit Fullscreen" menu item.
 // TODO(jackhou): Remove the dependency on BrowserWindowController(Private).
@@ skipping 96 matching lines @@
       break;
     }
     case IDC_SHOW_AS_TAB: {
       // Hide this menu option if the window is tabbed or is the devtools
       // window.
       NSMenuItem* menuItem = base::mac::ObjCCast<NSMenuItem>(item);
       [menuItem setHidden:browser->is_type_tabbed() || browser->is_devtools()];
       break;
     }
     default:
-      // Special handling for the contents of the Text Encoding submenu. On
-      // Mac OS, instead of enabling/disabling the top-level menu item, we
-      // enable/disable the submenu's contents (per Apple's HIG).
-      EncodingMenuController encoding_controller;
-      if (encoding_controller.DoesCommandBelongToEncodingMenu(tag))
-        enable &= chrome::IsCommandEnabled(browser, IDC_ENCODING_MENU);
+      break;
   }
 
   // If the item is toggleable, find its toggle state and
   // try to update it.  This is a little awkward, but the alternative is
   // to check after a commandDispatch, which seems worse.
   UpdateToggleStateWithTag(tag, item, window);
 
   return enable;
 }
 
@@ skipping 26 matching lines @@
     // the background" in this case.
     modifierFlags &= ~NSCommandKeyMask;
   }
   chrome::ExecuteCommandWithDisposition(
       FindBrowserForSender(sender, window), command,
       ui::WindowOpenDispositionFromNSEventWithFlags([NSApp currentEvent],
                                                     modifierFlags));
 }
 
 @end