summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/cocoa/browser_window_controller.mm3
-rw-r--r--chrome/browser/encoding_menu_controller_delegate.cc0
-rw-r--r--chrome/browser/encoding_menu_controller_delegate.h0
-rw-r--r--chrome/chrome.gyp1
4 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm
index c13aabf..f71b0ff 100644
--- a/chrome/browser/cocoa/browser_window_controller.mm
+++ b/chrome/browser/cocoa/browser_window_controller.mm
@@ -508,7 +508,8 @@ willPositionSheet:(NSWindow*)sheet
}
// Update the checked/Unchecked state of items in the encoding menu.
- // On Windows this logic is part of encoding_menu_controller_delegate.cc
+ // On Windows, this logic is part of |EncodingMenuModel| in
+ // browser/views/toolbar_view.h.
EncodingMenuController encoding_controller;
if (encoding_controller.DoesCommandBelongToEncodingMenu(tag)) {
DCHECK(browser_.get());
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ /dev/null
diff --git a/chrome/browser/encoding_menu_controller_delegate.h b/chrome/browser/encoding_menu_controller_delegate.h
deleted file mode 100644
index e69de29..0000000
--- a/chrome/browser/encoding_menu_controller_delegate.h
+++ /dev/null
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8d5182a..fe1dcbc 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2609,7 +2609,6 @@
'browser/extensions/extension_creator.cc',
'browser/extensions/pack_extension_job.cc',
'browser/dom_ui/html_dialog_contents.cc',
- 'browser/encoding_menu_controller_delegate.cc',
'browser/external_tab_container.cc',
'browser/google_update.cc',
'browser/history/history_indexer.idl',