Move sticky keys files to their own directory and rename to StickyKeysController.

ash/sticky_keys/sticky_keys_controller.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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>
 #include <X11/Xlib.h>
 #undef RootWindow
 #endif
 
 #include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
 #include "ui/aura/root_window.h"
@@ skipping 65 matching lines @@
     aura::Window* target)  {
   DCHECK(target);
   target->GetDispatcher()->AsRootWindowHostDelegate()
       ->OnHostScrollEvent(event);
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeys
-StickyKeys::StickyKeys()
+StickyKeysController::StickyKeysController()
     : enabled_(false),
       shift_sticky_key_(
           new StickyKeysHandler(ui::EF_SHIFT_DOWN,
                               new StickyKeysHandlerDelegateImpl())),
       alt_sticky_key_(
           new StickyKeysHandler(ui::EF_ALT_DOWN,
                                 new StickyKeysHandlerDelegateImpl())),
       ctrl_sticky_key_(
           new StickyKeysHandler(ui::EF_CONTROL_DOWN,
                                 new StickyKeysHandlerDelegateImpl())) {
 }
 
-StickyKeys::~StickyKeys() {
+StickyKeysController::~StickyKeysController() {
 }
 
-void StickyKeys::Enable(bool enabled) {
+void StickyKeysController::Enable(bool enabled) {
   if (enabled_ != enabled) {
     enabled_ = enabled;
 
     // Reset key handlers when activating sticky keys to ensure all
     // the handlers' states are reset.
     if (enabled_) {
       shift_sticky_key_.reset(
           new StickyKeysHandler(ui::EF_SHIFT_DOWN,
                               new StickyKeysHandlerDelegateImpl()));
       alt_sticky_key_.reset(
           new StickyKeysHandler(ui::EF_ALT_DOWN,
                                 new StickyKeysHandlerDelegateImpl()));
       ctrl_sticky_key_.reset(
           new StickyKeysHandler(ui::EF_CONTROL_DOWN,
                                 new StickyKeysHandlerDelegateImpl()));
     }
   }
 }
 
-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) {
     return;
   }
 
   if (enabled_ && HandleKeyEvent(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();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 //  StickyKeysHandler
 StickyKeysHandler::StickyKeysHandler(ui::EventFlags target_modifier_flag,
                                      StickyKeysHandlerDelegate* delegate)
     : modifier_flag_(target_modifier_flag),
       current_state_(DISABLED),
@@ skipping 263 matching lines @@
           &xievent->mods.effective));
     }
   }
 #elif defined(USE_OZONE)
   NOTIMPLEMENTED() << "Modifier key is not handled";
 #endif
   event->set_flags(event->flags() | modifier_flag_);
 }
 
 }  // namespace ash