| Index: ui/wm/core/focus_controller.h
|
| diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h
|
| index 98842c44e4a8d92191e7c52059c21ebd57c1fd24..85858cfa27e30c17770b5cc3c3717ff152f2635f 100644
|
| --- a/ui/wm/core/focus_controller.h
|
| +++ b/ui/wm/core/focus_controller.h
|
| @@ -49,7 +49,6 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,
|
| explicit FocusController(FocusRules* rules);
|
| ~FocusController() override;
|
|
|
| - protected:
|
| // Overridden from aura::client::ActivationClient:
|
| void AddObserver(aura::client::ActivationChangeObserver* observer) override;
|
| void RemoveObserver(
|
| @@ -68,6 +67,7 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,
|
| void ResetFocusWithinActiveWindow(aura::Window* window) override;
|
| aura::Window* GetFocusedWindow() override;
|
|
|
| + protected:
|
| // Overridden from ui::EventHandler:
|
| void OnKeyEvent(ui::KeyEvent* event) override;
|
| void OnMouseEvent(ui::MouseEvent* event) override;
|
|
|