2 files changed, 0 insertions, 69 deletions

diff --git a/views/focus/focus_manager.cc b/views/focus/focus_manager.cc
index dc26649..04f1f9b 100644
--- a/views/focus/focus_manager.cc
+++ b/views/focus/focus_manager.cc
@@ -57,21 +57,6 @@ bool FocusManager::OnKeyDown(HWND window, UINT message, WPARAM wparam,
     return false;
   }
 
-  // First give the registered keystroke handlers a chance a processing
-  // the message
-  // Do some basic checking to try to catch evil listeners that change the list
-  // from under us.
-  KeystrokeListenerList::size_type original_count =
-      keystroke_listeners_.size();
-  for (int i = 0; i < static_cast<int>(keystroke_listeners_.size()); i++) {
-    if (keystroke_listeners_[i]->ProcessKeyStroke(window, message, wparam,
-                                                  lparam)) {
-      return false;
-    }
-  }
-  DCHECK_EQ(original_count, keystroke_listeners_.size())
-      << "KeystrokeListener list modified during notification";
-
   int virtual_key_code = static_cast<int>(wparam);
   int repeat_count = LOWORD(lparam);
   int flags = HIWORD(lparam);
@@ -133,18 +118,6 @@ bool FocusManager::OnKeyDown(HWND window, UINT message, WPARAM wparam,
   }
   return true;
 }
-
-bool FocusManager::OnKeyUp(HWND window, UINT message, WPARAM wparam,
-                           LPARAM lparam) {
-  for (int i = 0; i < static_cast<int>(keystroke_listeners_.size()); ++i) {
-    if (keystroke_listeners_[i]->ProcessKeyStroke(window, message, wparam,
-                                                  lparam)) {
-      return false;
-    }
-  }
-
-  return true;
-}
 #endif
 
 void FocusManager::ValidateFocusedView() {
@@ -464,24 +437,6 @@ void FocusManager::ViewRemoved(View* parent, View* removed) {
     ClearFocus();
 }
 
-void FocusManager::AddKeystrokeListener(KeystrokeListener* listener) {
-  DCHECK(std::find(keystroke_listeners_.begin(), keystroke_listeners_.end(),
-                   listener) == keystroke_listeners_.end())
-                       << "Adding a listener twice.";
-  keystroke_listeners_.push_back(listener);
-}
-
-void FocusManager::RemoveKeystrokeListener(KeystrokeListener* listener) {
-  KeystrokeListenerList::iterator place =
-      std::find(keystroke_listeners_.begin(), keystroke_listeners_.end(),
-                listener);
-  if (place == keystroke_listeners_.end()) {
-    NOTREACHED() << "Removing a listener that isn't registered.";
-    return;
-  }
-  keystroke_listeners_.erase(place);
-}
-
 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) {
   DCHECK(std::find(focus_change_listeners_.begin(),
                    focus_change_listeners_.end(), listener) ==
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h
index 8b4c8c9a..b1c87b6 100644
--- a/views/focus/focus_manager.h
+++ b/views/focus/focus_manager.h
@@ -128,19 +128,6 @@ class FocusTraversable {
   virtual View* GetFocusTraversableParentView() = 0;
 };
 
-// The KeystrokeListener interface is used by components (such as the
-// ExternalTabContainer class) which need a crack at handling all
-// keystrokes.
-class KeystrokeListener {
- public:
-  // If this returns true, then the component handled the keystroke and ate
-  // it.
-#if defined(OS_WIN)
-  virtual bool ProcessKeyStroke(HWND window, UINT message, WPARAM wparam,
-                                LPARAM lparam) = 0;
-#endif
-};
-
 // This interface should be implemented by classes that want to be notified when
 // the focus is about to change.  See the Add/RemoveFocusChangeListener methods.
 class FocusChangeListener {
@@ -159,10 +146,6 @@ class FocusManager {
                  UINT message,
                  WPARAM wparam,
                  LPARAM lparam);
-  bool OnKeyUp(HWND window,
-               UINT message,
-               WPARAM wparam,
-               LPARAM lparam);
 #endif
 
   // Returns true is the specified is part of the hierarchy of the window
@@ -224,9 +207,6 @@ class FocusManager {
   // that this FocusManager is attached to the parent Widget of.
   void ViewRemoved(View* parent, View* removed);
 
-  void AddKeystrokeListener(KeystrokeListener* listener);
-  void RemoveKeystrokeListener(KeystrokeListener* listener);
-
   // Adds/removes a listener.  The FocusChangeListener is notified every time
   // the focused view is about to change.
   void AddFocusChangeListener(FocusChangeListener* listener);
@@ -280,10 +260,6 @@ class FocusManager {
   typedef std::map<Accelerator, AcceleratorTargetList> AcceleratorMap;
   AcceleratorMap accelerators_;
 
-  // The list of registered keystroke listeners
-  typedef std::vector<KeystrokeListener*> KeystrokeListenerList;
-  KeystrokeListenerList keystroke_listeners_;
-
   // The list of registered FocusChange listeners.
   typedef std::vector<FocusChangeListener*> FocusChangeListenerList;
   FocusChangeListenerList focus_change_listeners_;