Reland "Add BUILD.gn for ui/base/user_activity"

This is a reland of a230653d

There is a global singleton in user_activity which is used from
multiple components - therefore, ui/base/user_activity itself has to
be a component.

Original change's description:
> Add BUILD.gn for ui/base/user_activity
>
> ui/base/user_activity causes ui/base to have a dependency on ui/events.
> To remove another instance of this dependency, put user_activity into
> its own component.
>
>
> Bug: 921723
> Change-Id: I8c82bcb82b876386c63fa263937280c48ceb43fb
> Reviewed-on: https://chromium-review.googlesource.com/c/1448735
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Daniel Libby <dlibby@microsoft.com>
> Cr-Commit-Position: refs/heads/master@{#628473}

Bug: 921723
Change-Id: If80874d9cf2ae032d8931bfa3aa292b63bfa7119
Reviewed-on: https://chromium-review.googlesource.com/c/1452996Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Daniel Libby <dlibby@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#629140}

ash/BUILD.gn

@@ -1341,6 +1341,7 @@ component("ash") {
     "//ui/base",
     "//ui/base:ui_data_pack",
     "//ui/base/ime",
+    "//ui/base/user_activity",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/chromeos/resources",
@@ -1901,6 +1902,7 @@ test("ash_unittests") {
     "//ui/base",
     "//ui/base:test_support",
     "//ui/base/ime",
+    "//ui/base/user_activity",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/compositor",

chrome/browser/chromeos/BUILD.gn

@@ -233,6 +233,7 @@ source_set("chromeos") {
     "//ui/aura",
     "//ui/base",
     "//ui/base/idle",
+    "//ui/base/user_activity",
     "//ui/chromeos",
     "//ui/chromeos/events",
     "//ui/compositor",

chrome/browser/ui/BUILD.gn

@@ -1795,6 +1795,7 @@ jumbo_split_static_library("ui") {
       "//services/ws/public/cpp",
       "//services/ws/public/mojom",
       "//ui/base/ime",
+      "//ui/base/user_activity",
       "//ui/chromeos",
       "//ui/chromeos/events",
       "//ui/compositor_extra",

extensions/shell/BUILD.gn

@@ -196,6 +196,7 @@ source_set("app_shell_lib") {
       "browser/shell_native_app_window_aura.h",
     ]
     deps += [
+      "//ui/base/user_activity",
       "//ui/platform_window",
       "//ui/wm",
       "//ui/wm/public",

ui/aura/BUILD.gn

@@ -193,6 +193,7 @@ jumbo_component("aura") {
     "//ui/base",
     "//ui/base/clipboard",
     "//ui/base/ime",
+    "//ui/base/user_activity",
     "//ui/display",
     "//ui/events",
     "//ui/events:dom_keyboard_layout",
@@ -429,6 +430,7 @@ test("aura_unittests") {
     "//ui/aura_extra:tests",
     "//ui/base:test_support",
     "//ui/base/clipboard:clipboard_types",
+    "//ui/base/user_activity",
     "//ui/compositor:test_support",
     "//ui/compositor_extra",
     "//ui/display:test_support",

ui/base/BUILD.gn

@@ -249,9 +249,6 @@ jumbo_component("base") {
     "ui_base_switches_util.h",
     "ui_base_types.cc",
     "ui_base_types.h",
-    "user_activity/user_activity_detector.cc",
-    "user_activity/user_activity_detector.h",
-    "user_activity/user_activity_observer.h",
     "view_prop.cc",
     "view_prop.h",
     "webui/i18n_source_stream.cc",
@@ -870,9 +867,7 @@ test("ui_base_unittests") {
       sources += [ "ime/composition_text_util_pango_unittest.cc" ]
     }
     if (is_chromeos || use_ozone) {
-      sources += [
-        "ime/character_composer_unittest.cc",
-      ]
+      sources += [ "ime/character_composer_unittest.cc" ]
     }
   }
 
@@ -893,6 +888,7 @@ test("ui_base_unittests") {
     "//ui/base:ui_data_pack",
     "//ui/base/clipboard:clipboard_test",
     "//ui/base/clipboard:clipboard_types",
+    "//ui/base/user_activity",
     "//ui/display",
     "//ui/events:events_base",
     "//ui/events:test_support",

ui/base/idle/BUILD.gn

@@ -52,6 +52,7 @@ jumbo_component("idle") {
     deps += [
       "//chromeos",
       "//chromeos/dbus",
+      "//ui/base/user_activity",
     ]
     sources -= [ "idle_linux.cc" ]
   }

ui/base/user_activity/BUILD.gn

+# Copyright 2019 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.
+
+import("//build/config/jumbo.gni")
+import("//build/config/ui.gni")
+import("//testing/test.gni")
+
+if (is_android) {
+  import("//build/config/android/rules.gni")
+} else if (is_mac) {
+  import("//build/config/mac/rules.gni")
+}
+
+jumbo_component("user_activity") {
+  output_name = "ui_user_activity"
+
+  defines = [ "IS_UI_BASE_USER_ACTIVITY_IMPL" ]
+
+  sources = [
+    "user_activity_detector.cc",
+    "user_activity_detector.h",
+    "user_activity_observer.h",
+  ]
+
+  deps = [
+    "//ui/events:events",
+  ]
+}

ui/base/user_activity/user_activity_detector.h

@@ -6,10 +6,10 @@
 #define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_
 
 #include "base/compiler_specific.h"
+#include "base/component_export.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
-#include "ui/base/ui_base_export.h"
 #include "ui/events/event.h"
 #include "ui/events/platform/platform_event_observer.h"
 
@@ -18,7 +18,8 @@ namespace ui {
 class UserActivityObserver;
 
 // Watches for input events and notifies observers that the user is active.
-class UI_BASE_EXPORT UserActivityDetector : public PlatformEventObserver {
+class COMPONENT_EXPORT(UI_BASE_USER_ACTIVITY) UserActivityDetector
+    : public PlatformEventObserver {
  public:
   // Minimum amount of time between notifications to observers.
   static const int kNotifyIntervalMs;

ui/base/user_activity/user_activity_observer.h

@@ -5,8 +5,8 @@
 #ifndef UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_
 #define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_
 
+#include "base/component_export.h"
 #include "base/macros.h"
-#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class Event;
@@ -16,7 +16,7 @@ namespace ui {
 
 // Interface for classes that want to be notified about user activity.
 // Implementations should register themselves with UserActivityDetector.
-class UI_BASE_EXPORT UserActivityObserver {
+class COMPONENT_EXPORT(UI_BASE_USER_ACTIVITY) UserActivityObserver {
  public:
   // Invoked periodically while the user is active (i.e. generating input
   // events). |event| is the event that triggered the notification; it may

ui/chromeos/BUILD.gn

@@ -43,6 +43,7 @@ component("chromeos") {
     "//ui/aura",
     "//ui/base",
     "//ui/base/ime",
+    "//ui/base/user_activity",
     "//ui/chromeos/resources",
     "//ui/chromeos/strings",
     "//ui/display",

ui/display/manager/BUILD.gn

@@ -62,6 +62,7 @@ jumbo_component("manager") {
     "//base",
     "//third_party/re2",
     "//ui/base",
+    "//ui/base/user_activity",
     "//ui/display/mojo:interfaces",
     "//ui/display/util",
     "//ui/events:platform_event",