summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-15 18:29:42 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-15 18:29:42 +0000
commit75dbbeb5836a8e65189d48be7c05ad927502babd (patch)
tree2e3519943b42c46437f4186754c1d62238225220
parent8188ca99c332414ed63b70f040c6796cd059cda1 (diff)
downloadchromium_src-75dbbeb5836a8e65189d48be7c05ad927502babd.zip
chromium_src-75dbbeb5836a8e65189d48be7c05ad927502babd.tar.gz
chromium_src-75dbbeb5836a8e65189d48be7c05ad927502babd.tar.bz2
Remove unused method.
TBR=sky@chromium.org BUG=none Review URL: https://codereview.chromium.org/396473003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283222 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/wm/core/default_activation_client.cc5
-rw-r--r--ui/wm/core/default_activation_client.h2
-rw-r--r--ui/wm/core/focus_controller.cc6
-rw-r--r--ui/wm/core/focus_controller.h2
-rw-r--r--ui/wm/public/activation_client.h4
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;