Organize //chromeos/ui with a 'base' dir

BUG=1113900
R=jamescook@chromium.org, oshima@chromium.org

Change-Id: I973b038eeb301d07974a08f44fdef9c5afaad933
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2461786Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#815406}

ash/BUILD.gn

@@ -1722,7 +1722,7 @@ component("ash") {
     "//chromeos/components/phonehub",
     "//chromeos/components/quick_answers",
     "//chromeos/components/quick_answers/public/cpp:prefs",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
     "//services/viz/public/mojom",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.
@@ -2322,7 +2322,7 @@ test("ash_unittests") {
     "//build:branding_buildflags",
     "//chromeos:test_support",
     "//chromeos/strings:strings_grit",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
     "//chromeos/ui/vector_icons",
 
     # TODO(https://crbug.com/644336): Make CrasAudioHandler Chrome or Ash only.

ash/public/cpp/BUILD.gn

@@ -342,7 +342,7 @@ component("cpp") {
     "//chromeos/services/assistant/public/cpp",
     "//chromeos/services/cellular_setup:in_process_esim_manager",
     "//chromeos/services/network_config:in_process_instance",
-    "//chromeos/ui",
+    "//chromeos/ui/base",
     "//chromeos/ui/vector_icons",
     "//components/pref_registry",
     "//components/prefs",

ash/public/cpp/DEPS

 include_rules = [
   "+chromeos/services",
-  "+chromeos/ui/chromeos_ui_constants.h",
+  "+chromeos/ui/base/chromeos_ui_constants.h",
   "+cc/metrics",
   "+components/prefs",
   "+services/data_decoder/public",

ash/public/cpp/caption_buttons/frame_caption_button_container_view.cc

@@ -13,7 +13,7 @@
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/numerics/ranges.h"
-#include "chromeos/ui/tablet_state.h"
+#include "chromeos/ui/base/tablet_state.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"

ash/public/cpp/default_frame_header.h

@@ -12,7 +12,7 @@
 #include "base/compiler_specific.h"  // override
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 
 namespace ash {
 

ash/public/cpp/frame_utils.cc

@@ -5,7 +5,7 @@
 #include "ash/public/cpp/frame_utils.h"
 
 #include "ash/public/cpp/window_properties.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"

ash/public/cpp/window_properties.cc

@@ -9,7 +9,7 @@
 #include "ash/public/cpp/window_backdrop.h"
 #include "ash/public/cpp/window_pin_type.h"
 #include "ash/public/cpp/window_state_type.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/window_properties.h"

ash/wm/resize_shadow_and_cursor_unittest.cc

@@ -10,7 +10,7 @@
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_state.h"
 #include "base/bind.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"

ash/wm/tablet_mode/tablet_mode_controller.h

@@ -23,7 +23,7 @@
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chromeos/dbus/power/power_manager_client.h"
-#include "chromeos/ui/tablet_state.h"
+#include "chromeos/ui/base/tablet_state.h"
 #include "ui/aura/window_occlusion_tracker.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_observer.h"

ash/wm/window_util.cc

@@ -26,7 +26,7 @@
 #include "ash/wm/window_positioning_utils.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/wm_event.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_client.h"

ash/wm/workspace/multi_window_resize_controller_unittest.cc

@@ -20,7 +20,7 @@
 #include "ash/wm/workspace_controller_test_api.h"
 #include "base/memory/ptr_util.h"
 #include "base/stl_util.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"

chrome/browser/ui/BUILD.gn

@@ -2655,7 +2655,7 @@ static_library("ui") {
       "//chromeos/settings",
       "//chromeos/strings",
       "//chromeos/system",
-      "//chromeos/ui",
+      "//chromeos/ui/base",
       "//chromeos/ui/vector_icons",
       "//components/arc",
       "//components/assist_ranker",

chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

@@ -31,7 +31,7 @@
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/extensions/extension_constants.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "components/session_manager/core/session_manager.h"
 #include "extensions/browser/app_window/app_delegate.h"
 #include "extensions/common/constants.h"

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc

@@ -38,7 +38,7 @@
 #include "chrome/browser/ui/web_applications/app_browser_controller.h"
 #include "chrome/browser/ui/web_applications/system_web_app_ui_utils.h"
 #include "chromeos/constants/chromeos_features.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_enums.mojom.h"

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -73,7 +73,7 @@
 #include "chrome/common/web_application_info.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #include "components/account_id/account_id.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/keep_alive_registry/keep_alive_types.h"

chrome/browser/ui/views/location_bar/custom_tab_bar_view.cc

@@ -47,7 +47,7 @@
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
-#include "chromeos/ui/chromeos_ui_constants.h"
+#include "chromeos/ui/base/chromeos_ui_constants.h"
 #else
 #include "chrome/browser/themes/theme_properties.h"
 #endif

chromeos/ui/BUILD.gn → chromeos/ui/base/BUILD.gn

@@ -6,8 +6,8 @@ assert(is_chromeos || chromeos_is_browser_only,
        "Non-Chrome-OS or Lacros builds must not depend on //chromeos")
 
 # C++ headers and sources that can be used by both ash and lacros builds.
-component("ui") {
-  defines = [ "IS_CHROMEOS_UI_IMPL" ]
+component("base") {
+  defines = [ "IS_CHROMEOS_UI_BASE_IMPL" ]
 
   sources = [
     "chromeos_ui_constants.h",
@@ -15,7 +15,7 @@ component("ui") {
     "tablet_state.h",
   ]
 
-  output_name = "chromeos_ui"
+  output_name = "chromeos_ui_base"
 
   deps = [
     "//base",

chromeos/ui/chromeos_ui_constants.h → chromeos/ui/base/chromeos_ui_constants.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 CHROMEOS_UI_CHROMEOS_UI_CONSTANTS_H_
-#define CHROMEOS_UI_CHROMEOS_UI_CONSTANTS_H_
+#ifndef CHROMEOS_UI_BASE_CHROMEOS_UI_CONSTANTS_H_
+#define CHROMEOS_UI_BASE_CHROMEOS_UI_CONSTANTS_H_
 
 #include "third_party/skia/include/core/SkColor.h"
 
@@ -26,4 +26,4 @@ constexpr SkColor kDefaultFrameColor = SkColorSetRGB(0xFD, 0xFE, 0xFF);
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_UI_CHROMEOS_UI_CONSTANTS_H_
+#endif  // CHROMEOS_UI_BASE_CHROMEOS_UI_CONSTANTS_H_

chromeos/ui/tablet_state.cc → chromeos/ui/base/tablet_state.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 "chromeos/ui/tablet_state.h"
+#include "chromeos/ui/base/tablet_state.h"
 
 #include "base/check_op.h"
 

chromeos/ui/tablet_state.h → chromeos/ui/base/tablet_state.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 CHROMEOS_UI_TABLET_STATE_H_
-#define CHROMEOS_UI_TABLET_STATE_H_
+#ifndef CHROMEOS_UI_BASE_TABLET_STATE_H_
+#define CHROMEOS_UI_BASE_TABLET_STATE_H_
 
 #include "base/component_export.h"
 
@@ -17,7 +17,7 @@ namespace chromeos {
 //
 // The idea is that only the creator of this class in Ash or Lacros/Ozone code
 // is able to set the state.
-class COMPONENT_EXPORT(CHROMEOS_UI) TabletState {
+class COMPONENT_EXPORT(CHROMEOS_UI_BASE) TabletState {
  public:
   // Returns the singleton instance.
   static TabletState* Get();
@@ -55,4 +55,4 @@ class COMPONENT_EXPORT(CHROMEOS_UI) TabletState {
 
 }  // namespace chromeos
 
-#endif  // CHROMEOS_UI_TABLET_STATE_H_
+#endif  // CHROMEOS_UI_BASE_TABLET_STATE_H_