Index: ash/sticky_keys/sticky_keys_controller.cc |
diff --git a/ash/wm/sticky_keys.cc b/ash/sticky_keys/sticky_keys_controller.cc |
similarity index 95% |
rename from ash/wm/sticky_keys.cc |
rename to ash/sticky_keys/sticky_keys_controller.cc |
index 9e2cc2a92de76c9cf80d06fed44f589dadbf21d9..a34cded433686c9b435173ba8636d3b271680281 100644 |
--- a/ash/wm/sticky_keys.cc |
+++ b/ash/sticky_keys/sticky_keys_controller.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "ash/wm/sticky_keys.h" |
+#include "ash/sticky_keys/sticky_keys_controller.h" |
#if defined(USE_X11) |
#include <X11/extensions/XInput2.h> |
@@ -88,7 +88,7 @@ void StickyKeysHandlerDelegateImpl::DispatchScrollEvent( |
/////////////////////////////////////////////////////////////////////////////// |
// StickyKeys |
-StickyKeys::StickyKeys() |
+StickyKeysController::StickyKeysController() |
: enabled_(false), |
shift_sticky_key_( |
new StickyKeysHandler(ui::EF_SHIFT_DOWN, |
@@ -101,10 +101,10 @@ StickyKeys::StickyKeys() |
new StickyKeysHandlerDelegateImpl())) { |
} |
-StickyKeys::~StickyKeys() { |
+StickyKeysController::~StickyKeysController() { |
} |
-void StickyKeys::Enable(bool enabled) { |
+void StickyKeysController::Enable(bool enabled) { |
if (enabled_ != enabled) { |
enabled_ = enabled; |
@@ -124,26 +124,26 @@ void StickyKeys::Enable(bool enabled) { |
} |
} |
-bool StickyKeys::HandleKeyEvent(ui::KeyEvent* event) { |
+bool StickyKeysController::HandleKeyEvent(ui::KeyEvent* event) { |
return shift_sticky_key_->HandleKeyEvent(event) || |
alt_sticky_key_->HandleKeyEvent(event) || |
ctrl_sticky_key_->HandleKeyEvent(event); |
return ctrl_sticky_key_->HandleKeyEvent(event); |
} |
-bool StickyKeys::HandleMouseEvent(ui::MouseEvent* event) { |
+bool StickyKeysController::HandleMouseEvent(ui::MouseEvent* event) { |
return shift_sticky_key_->HandleMouseEvent(event) || |
alt_sticky_key_->HandleMouseEvent(event) || |
ctrl_sticky_key_->HandleMouseEvent(event); |
} |
-bool StickyKeys::HandleScrollEvent(ui::ScrollEvent* event) { |
+bool StickyKeysController::HandleScrollEvent(ui::ScrollEvent* event) { |
return shift_sticky_key_->HandleScrollEvent(event) || |
alt_sticky_key_->HandleScrollEvent(event) || |
ctrl_sticky_key_->HandleScrollEvent(event); |
} |
-void StickyKeys::OnKeyEvent(ui::KeyEvent* event) { |
+void StickyKeysController::OnKeyEvent(ui::KeyEvent* event) { |
// Do not consume a translated key event which is generated by an IME. |
if (event->type() == ui::ET_TRANSLATED_KEY_PRESS || |
event->type() == ui::ET_TRANSLATED_KEY_RELEASE) { |
@@ -154,12 +154,12 @@ void StickyKeys::OnKeyEvent(ui::KeyEvent* event) { |
event->StopPropagation(); |
} |
-void StickyKeys::OnMouseEvent(ui::MouseEvent* event) { |
+void StickyKeysController::OnMouseEvent(ui::MouseEvent* event) { |
if (enabled_ && HandleMouseEvent(event)) |
event->StopPropagation(); |
} |
-void StickyKeys::OnScrollEvent(ui::ScrollEvent* event) { |
+void StickyKeysController::OnScrollEvent(ui::ScrollEvent* event) { |
if (enabled_ && HandleScrollEvent(event)) |
event->StopPropagation(); |
} |