Show a visual indicator for the progress of auto-click.

ash/autoclick/autoclick_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/autoclick/autoclick_controller.h"
+#include "ash/autoclick/autoclick_ring_handler.h"
 
 #include "ash/shell.h"
 #include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/common/root_window_finder.h"
 #include "base/timer/timer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
@@ skipping 40 matching lines @@
   void SetAutoclickDelay(int delay_ms) override;
   int GetAutoclickDelay() const override;
 
   // ui::EventHandler overrides:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnKeyEvent(ui::KeyEvent* event) override;
   void OnTouchEvent(ui::TouchEvent* event) override;
   void OnGestureEvent(ui::GestureEvent* event) override;
   void OnScrollEvent(ui::ScrollEvent* event) override;
 
+  void StartRingDisplay(ui::LocatedEvent* event);
+  void StopRingDisplay(ui::LocatedEvent* event);
+
   void InitClickTimer();
 
   void DoAutoclick();
 
   bool enabled_;
   int delay_ms_;
   int mouse_event_flags_;
   std::unique_ptr<base::Timer> autoclick_timer_;
+  std::unique_ptr<LongPressAutoclickRingHandler> autoclick_ring_display_;
   // The position in screen coordinates used to determine
   // the distance the mouse has moved.
   gfx::Point anchor_location_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoclickControllerImpl);
 };
 
 
 AutoclickControllerImpl::AutoclickControllerImpl()
     : enabled_(false),
       delay_ms_(kDefaultAutoclickDelayMs),
       mouse_event_flags_(ui::EF_NONE),
       anchor_location_(-kMovementThreshold, -kMovementThreshold) {
   InitClickTimer();
+  autoclick_ring_display_.reset(new LongPressAutoclickRingHandler);

[jdufault, 2016/05/31 19:06:15]

Use trailing parens with constructors: new LongPressAutoclickRingHandler()

There's actually a semantic difference between them, unfortunately.

[sammiequon, 2016/06/03 21:34:31]

Done.

 }
 
 AutoclickControllerImpl::~AutoclickControllerImpl() {
 }
 
 void AutoclickControllerImpl::SetEnabled(bool enabled) {
   if (enabled_ == enabled)
     return;
   enabled_ = enabled;
 
@@ skipping 11 matching lines @@
 
 void AutoclickControllerImpl::SetAutoclickDelay(int delay_ms) {
   delay_ms_ = delay_ms;
   InitClickTimer();
 }
 
 int AutoclickControllerImpl::GetAutoclickDelay() const {
   return delay_ms_;
 }
 
+void AutoclickControllerImpl::StartRingDisplay(ui::LocatedEvent* event) {
+  autoclick_ring_display_->ProcessEvent(event, delay_ms_, true);
+}
+
+void AutoclickControllerImpl::StopRingDisplay(ui::LocatedEvent* event) {
+  autoclick_ring_display_->ProcessEvent(event, delay_ms_, false);
+}
+
 void AutoclickControllerImpl::InitClickTimer() {
   autoclick_timer_.reset(new base::Timer(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(delay_ms_),
       base::Bind(&AutoclickControllerImpl::DoAutoclick,
                  base::Unretained(this)),
       false));
 }
 
 void AutoclickControllerImpl::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_MOVED &&
       !(event->flags() & ui::EF_IS_SYNTHESIZED)) {
     mouse_event_flags_ = event->flags();
 
     gfx::Point mouse_location = event->location();
     ::wm::ConvertPointToScreen(static_cast<aura::Window*>(event->target()),
                                &mouse_location);
 
     // The distance between the mouse location and the anchor location
     // must exceed a certain threshold to initiate a new autoclick countdown.
     // This ensures that mouse jitter caused by poor motor control does not
     // 1. initiate an unwanted autoclick from rest
     // 2. prevent the autoclick from ever occuring when the mouse
     //    arrives at the target.
     gfx::Vector2d delta = mouse_location - anchor_location_;
     if (delta.LengthSquared() >= kMovementThreshold * kMovementThreshold) {
       anchor_location_ = mouse_location;
       autoclick_timer_->Reset();
+      StartRingDisplay(event);
     }
   } else if (event->type() == ui::ET_MOUSE_PRESSED) {
     autoclick_timer_->Stop();
+    StopRingDisplay(event);
   } else if (event->type() == ui::ET_MOUSEWHEEL &&
              autoclick_timer_->IsRunning()) {
     autoclick_timer_->Reset();
+    StartRingDisplay(event);
   }
 }
 
 void AutoclickControllerImpl::OnKeyEvent(ui::KeyEvent* event) {
   int modifier_mask = ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
                       ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN |
                       ui::EF_IS_EXTENDED_KEY;
   int new_modifiers = event->flags() & modifier_mask;
   mouse_event_flags_ = (mouse_event_flags_ & ~modifier_mask) | new_modifiers;
 
-  if (!IsModifierKey(event->key_code()))
+  if (!IsModifierKey(event->key_code())) {
     autoclick_timer_->Stop();
+    StopRingDisplay(NULL);

[jdufault, 2016/05/31 19:06:15]

nit: nullptr

[sammiequon, 2016/06/03 21:34:30]

Done.

+  }
 }
 
 void AutoclickControllerImpl::OnTouchEvent(ui::TouchEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay(event);
 }
 
 void AutoclickControllerImpl::OnGestureEvent(ui::GestureEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay(event);
 }
 
 void AutoclickControllerImpl::OnScrollEvent(ui::ScrollEvent* event) {
   autoclick_timer_->Stop();
+  StopRingDisplay(event);
 }
 
 void AutoclickControllerImpl::DoAutoclick() {
   gfx::Point screen_location =
       aura::Env::GetInstance()->last_mouse_location();
   aura::Window* root_window =
       wm::WmWindowAura::GetAuraWindow(wm::GetRootWindowAt(screen_location));
   DCHECK(root_window) << "Root window not found while attempting autoclick.";
 
   gfx::Point click_location(screen_location);
@@ skipping 19 matching lines @@
   if (details.dispatcher_destroyed)
     return;
 }
 
 // static.
 AutoclickController* AutoclickController::CreateInstance() {
   return new AutoclickControllerImpl();
 }
 
 }  // namespace ash