Refactor class in ash/autoclick/common to ash/autoclick.

No functional changes. Bug: 876115 Change-Id: Id4a4008c6aff53ff4718b04d5c4186b97c769580 Reviewed-on: https://chromium-review.googlesource.com/c/1277987 Commit-Queue: Katie Dektar <katie@chromium.org> Reviewed-by: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#599257}
qweri0p · Oct 12, 2018 · 8c77038 · 8c77038
1 parent 8ce1b79
commit 8c77038
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 45 deletions.
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
@@ -244,6 +244,8 @@ component("ash") {
     "assistant/util/views_util.h",
     "autoclick/autoclick_controller.cc",
     "autoclick/autoclick_controller.h",
+    "autoclick/autoclick_ring_handler.cc",
+    "autoclick/autoclick_ring_handler.h",
     "bluetooth_devices_observer.cc",
     "bluetooth_devices_observer.h",
     "cancel_mode.cc",
@@ -1360,7 +1362,6 @@ component("ash") {
   deps = [
     "//ash/app_menu",
     "//ash/assistant/ui:constants",
-    "//ash/autoclick/common:autoclick",
     "//ash/components/cursor",
     "//ash/components/fast_ink",
     "//ash/components/quick_launch/public/mojom",
@@ -2015,7 +2016,6 @@ test("ash_unittests") {
     "//ash/app_list:test_support",
     "//ash/app_list/presenter",
     "//ash/app_menu",
-    "//ash/autoclick/common:autoclick",
     "//ash/components/fast_ink",
     "//ash/components/fast_ink:unit_tests",
     "//ash/components/quick_launch/public/mojom:constants",

diff --git a/ash/autoclick/autoclick_controller.cc b/ash/autoclick/autoclick_controller.cc
@@ -4,7 +4,7 @@
 
 #include "ash/autoclick/autoclick_controller.h"
 
-#include "ash/autoclick/common/autoclick_ring_handler.h"
+#include "ash/autoclick/autoclick_ring_handler.h"
 #include "ash/public/cpp/ash_constants.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"

diff --git a/...utoclick/common/autoclick_ring_handler.cc → ash/autoclick/autoclick_ring_handler.cc b/...utoclick/common/autoclick_ring_handler.cc → ash/autoclick/autoclick_ring_handler.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/autoclick/common/autoclick_ring_handler.h"
+#include "ash/autoclick/autoclick_ring_handler.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPath.h"

diff --git a/...autoclick/common/autoclick_ring_handler.h → ash/autoclick/autoclick_ring_handler.h b/...autoclick/common/autoclick_ring_handler.h → ash/autoclick/autoclick_ring_handler.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_AUTOCLICK_COMMON_AUTOCLICK_RING_HANDLER_H_
-#define ASH_AUTOCLICK_COMMON_AUTOCLICK_RING_HANDLER_H_
+#ifndef ASH_AUTOCLICK_AUTOCLICK_RING_HANDLER_H_
+#define ASH_AUTOCLICK_AUTOCLICK_RING_HANDLER_H_
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
@@ -57,4 +57,4 @@ class AutoclickRingHandler : public gfx::LinearAnimation {
 
 }  // namespace ash
 
-#endif  // ASH_AUTOCLICK_COMMON_AUTOCLICK_RING_HANDLER_H_
+#endif  // ASH_AUTOCLICK_AUTOCLICK_RING_HANDLER_H_
diff --git a/ash/autoclick/common/BUILD.gn b/ash/autoclick/common/BUILD.gn
diff --git a/ash/autoclick/common/DEPS b/ash/autoclick/common/DEPS