diff options
author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:23:44 +0000 |
---|---|---|
committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-14 17:23:44 +0000 |
commit | 354e2cfc4fdcac9cecc2d7eac369968de24d128b (patch) | |
tree | af432857dcb4f154b24a85109ed3360612421c45 /chrome/browser/cocoa/browser_window_controller.mm | |
parent | b72f60a49bd1e70dcdd41291193febf6374ad14e (diff) | |
download | chromium_src-354e2cfc4fdcac9cecc2d7eac369968de24d128b.zip chromium_src-354e2cfc4fdcac9cecc2d7eac369968de24d128b.tar.gz chromium_src-354e2cfc4fdcac9cecc2d7eac369968de24d128b.tar.bz2 |
Revert "Implement OS X Encoding Menu."
This reverts commit r16061.
TBR=jeremy
Review URL: http://codereview.chromium.org/115357
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/browser_window_controller.mm')
-rw-r--r-- | chrome/browser/cocoa/browser_window_controller.mm | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index 92f3527..283eb1e 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -8,7 +8,6 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" @@ -264,27 +263,6 @@ willPositionSheet:(NSWindow *)sheet if (oldState != newState) [item setState:newState]; } - - // Update the checked/Unchecked state of items in the encoding menu. - // On Windows this logic is part of encoding_menu_controller_delegate.cc - EncodingMenuController encoding_controller; - if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) { - DCHECK(browser_.get()); - Profile *profile = browser_->profile(); - DCHECK(profile); - TabContents* current_tab = browser_->GetSelectedTabContents(); - if (!current_tab) { - return; - } - const std::wstring encoding = current_tab->encoding(); - - bool toggled = encoding_controller.IsItemChecked(profile, encoding, tag); - NSInteger oldState = [item state]; - NSInteger newState = toggled ? NSOnState : NSOffState; - if (oldState != newState) - [item setState:newState]; - } - } // Called to validate menu and toolbar items when this window is key. All the |