Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3166)

Unified Diff: chrome/browser/ui/cocoa/browser_window_command_handler.mm

Issue 2254273003: Remove text encoding UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_command_handler.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_command_handler.mm b/chrome/browser/ui/cocoa/browser_window_command_handler.mm
index 16c4d22865138f5a061f7b3a48acf2a9a0710f43..e6970067c48214c757bf3c087d412fee69d61dad 100644
--- a/chrome/browser/ui/cocoa/browser_window_command_handler.mm
+++ b/chrome/browser/ui/cocoa/browser_window_command_handler.mm
@@ -14,7 +14,6 @@
#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"
@@ -57,25 +56,6 @@ void UpdateToggleStateWithTag(NSInteger tag, id item, NSWindow* window) {
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) {
@@ -192,12 +172,7 @@ Browser* FindBrowserForSender(id sender, NSWindow* window) {
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

Powered by Google App Engine
This is Rietveld 408576698