diff options
| -rw-r--r-- | ui/wm/core/default_activation_client.cc | 5 | ||||
| -rw-r--r-- | ui/wm/core/default_activation_client.h | 2 | ||||
| -rw-r--r-- | ui/wm/core/focus_controller.cc | 6 | ||||
| -rw-r--r-- | ui/wm/core/focus_controller.h | 2 | ||||
| -rw-r--r-- | ui/wm/public/activation_client.h | 4 |
5 files changed, 0 insertions, 19 deletions
diff --git a/ui/wm/core/default_activation_client.cc b/ui/wm/core/default_activation_client.cc index 222c9ac..94af0a5 100644 --- a/ui/wm/core/default_activation_client.cc +++ b/ui/wm/core/default_activation_client.cc @@ -106,11 +106,6 @@ aura::Window* DefaultActivationClient::GetToplevelWindow(aura::Window* window) { return NULL; } -bool DefaultActivationClient::OnWillFocusWindow(aura::Window* window, - const ui::Event* event) { - return true; -} - bool DefaultActivationClient::CanActivateWindow(aura::Window* window) const { return true; } diff --git a/ui/wm/core/default_activation_client.h b/ui/wm/core/default_activation_client.h index 3b6bffc..13b2474 100644 --- a/ui/wm/core/default_activation_client.h +++ b/ui/wm/core/default_activation_client.h @@ -41,8 +41,6 @@ class WM_EXPORT DefaultActivationClient : public aura::client::ActivationClient, virtual aura::Window* GetActiveWindow() OVERRIDE; virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE; virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE; - virtual bool OnWillFocusWindow(aura::Window* window, - const ui::Event* event) OVERRIDE; virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; // Overridden from WindowObserver: diff --git a/ui/wm/core/focus_controller.cc b/ui/wm/core/focus_controller.cc index 1534e40..66c6deb 100644 --- a/ui/wm/core/focus_controller.cc +++ b/ui/wm/core/focus_controller.cc @@ -85,12 +85,6 @@ aura::Window* FocusController::GetToplevelWindow(aura::Window* window) { return rules_->GetToplevelWindow(window); } -bool FocusController::OnWillFocusWindow(aura::Window* window, - const ui::Event* event) { - NOTREACHED(); - return false; -} - bool FocusController::CanActivateWindow(aura::Window* window) const { return rules_->CanActivateWindow(window); } diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h index 3366ea0..2f1aa0e 100644 --- a/ui/wm/core/focus_controller.h +++ b/ui/wm/core/focus_controller.h @@ -54,8 +54,6 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient, virtual aura::Window* GetActiveWindow() OVERRIDE; virtual aura::Window* GetActivatableWindow(aura::Window* window) OVERRIDE; virtual aura::Window* GetToplevelWindow(aura::Window* window) OVERRIDE; - virtual bool OnWillFocusWindow(aura::Window* window, - const ui::Event* event) OVERRIDE; virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; // Overridden from aura::client::FocusClient: diff --git a/ui/wm/public/activation_client.h b/ui/wm/public/activation_client.h index fc35131..4e01778 100644 --- a/ui/wm/public/activation_client.h +++ b/ui/wm/public/activation_client.h @@ -44,10 +44,6 @@ class AURA_EXPORT ActivationClient { // Retrieves the toplevel window for |window|, or NULL if there is none. virtual Window* GetToplevelWindow(Window* window) = 0; - // Invoked prior to |window| getting focus as a result of the |event|. |event| - // may be NULL. Returning false blocks |window| from getting focus. - virtual bool OnWillFocusWindow(Window* window, const ui::Event* event) = 0; - // Returns true if |window| can be activated, false otherwise. If |window| has // a modal child it can not be activated. virtual bool CanActivateWindow(Window* window) const = 0; |