Index: ui/wm/core/focus_controller.h |
diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h |
index 43d3c608b2138493f070bce4150b24a073edca58..5d4f8ae6262a61b5343d1e1fc6c11d79056206f8 100644 |
--- a/ui/wm/core/focus_controller.h |
+++ b/ui/wm/core/focus_controller.h |
@@ -36,7 +36,6 @@ class FocusRules; |
// focused windows). |
class WM_EXPORT FocusController : public aura::client::ActivationClient, |
public aura::client::FocusClient, |
- public ui::EventHandler, |
public aura::WindowObserver { |
public: |
// |rules| cannot be NULL. |
@@ -62,13 +61,6 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient, |
void ResetFocusWithinActiveWindow(aura::Window* window) override; |
aura::Window* GetFocusedWindow() override; |
- // Overridden from ui::EventHandler: |
- void OnKeyEvent(ui::KeyEvent* event) override; |
- void OnMouseEvent(ui::MouseEvent* event) override; |
- void OnScrollEvent(ui::ScrollEvent* event) override; |
- void OnTouchEvent(ui::TouchEvent* event) override; |
- void OnGestureEvent(ui::GestureEvent* event) override; |
- |
// Overridden from aura::WindowObserver: |
void OnWindowVisibilityChanged(aura::Window* window, bool visible) override; |
void OnWindowDestroying(aura::Window* window) override; |
@@ -94,11 +86,6 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient, |
void WindowLostFocusFromDispositionChange(aura::Window* window, |
aura::Window* next); |
- // Called when an attempt is made to focus or activate a window via an input |
- // event targeted at that window. Rules determine the best focusable window |
- // for the input window. |
- void WindowFocusedFromInputEvent(aura::Window* window); |
- |
aura::Window* active_window_; |
aura::Window* focused_window_; |