Move ui/base/dragdrop/file_info to ui/base/clipboard

ui::FileInfo is used in clipboard and other places besides dragdrop, so it makes more sense for it to move up a level. Bug: b/162602338 Change-Id: I5ebea1af6ec745c56932a66a7a34fb42e1ca4abd Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2651705 Commit-Queue: Joel Hockey <joelhockey@chromium.org> Auto-Submit: Joel Hockey <joelhockey@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Jun Mukai <mukai@chromium.org> Cr-Commit-Position: refs/heads/master@{#848880}
marcosholgado · Jan 30, 2021 · 5192d0a · 5192d0a
1 parent 15e0538
commit 5192d0a
Show file tree

Hide file tree

Showing 27 changed files with 43 additions and 43 deletions.
diff --git a/chrome/browser/chromeos/exo/chrome_data_exchange_delegate.cc b/chrome/browser/chromeos/exo/chrome_data_exchange_delegate.cc
@@ -40,8 +40,8 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_buffer.h"
 #include "ui/base/clipboard/custom_data_helper.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "url/gurl.h"
 

diff --git a/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc b/chrome/browser/chromeos/exo/chrome_data_exchange_delegate_unittest.cc
@@ -32,9 +32,9 @@
 #include "ui/base/clipboard/clipboard_buffer.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
 #include "ui/base/clipboard/custom_data_helper.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/gfx/geometry/rect.h"
 #include "url/origin.h"

diff --git a/chrome/browser/download/drag_download_item_aura.cc b/chrome/browser/download/drag_download_item_aura.cc
@@ -13,8 +13,8 @@
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/mojom/drag_drop_types.mojom-shared.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/display/screen.h"

diff --git a/components/exo/data_offer.cc b/components/exo/data_offer.cc
@@ -28,8 +28,8 @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_buffer.h"
 #include "ui/base/clipboard/clipboard_constants.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "url/gurl.h"
 

diff --git a/components/exo/drag_drop_operation.cc b/components/exo/drag_drop_operation.cc
@@ -18,9 +18,9 @@
 #include "components/viz/common/frame_sinks/copy_output_request.h"
 #include "components/viz/common/frame_sinks/copy_output_result.h"
 #include "ui/aura/client/drag_drop_client.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"

diff --git a/components/exo/test/exo_test_data_exchange_delegate.cc b/components/exo/test/exo_test_data_exchange_delegate.cc
@@ -16,8 +16,8 @@
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "url/gurl.h"
 
 namespace exo {

diff --git a/content/browser/file_system_access/file_system_access_drag_drop_browsertest.cc b/content/browser/file_system_access/file_system_access_drag_drop_browsertest.cc
@@ -15,7 +15,7 @@
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/gfx/geometry/point_f.h"
 
 namespace content {
@@ -232,4 +232,4 @@ IN_PROC_BROWSER_TEST_F(FileSystemAccessDragDropBrowserTest, DropDirectory) {
   // matching the base name of `file_inside_dir`.
   EXPECT_EQ(file_inside_dir.BaseName().AsUTF8Unsafe(), EvalJs(shell(), "p"));
 }
-}  // namespace content
+}  // namespace content
diff --git a/content/browser/renderer_host/drop_data_util.cc b/content/browser/renderer_host/drop_data_util.cc
@@ -21,7 +21,7 @@
 #include "third_party/blink/public/mojom/file_system_access/file_system_access_drag_drop_token.mojom.h"
 #include "third_party/blink/public/mojom/page/drag.mojom.h"
 #include "ui/base/clipboard/clipboard_constants.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "url/gurl.h"
 
 namespace content {

diff --git a/content/public/common/drop_data.h b/content/public/common/drop_data.h
@@ -21,7 +21,7 @@
 #include "content/common/content_export.h"
 #include "ipc/ipc_message.h"
 #include "services/network/public/mojom/referrer_policy.mojom.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "url/gurl.h"
 
 namespace content {

diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
@@ -455,7 +455,7 @@ component("base") {
   if (!is_ios) {
     # iOS does not use Chromium-specific code for event handling.
     public_deps += [
-      "//ui/base/dragdrop/file_info",
+      "//ui/base/clipboard:file_info",
       "//ui/events:events_base",
       "//ui/events/platform",
     ]
@@ -603,7 +603,7 @@ component("data_exchange") {
   deps = [
     "//base",
     "//ui/base/clipboard:clipboard_types",
-    "//ui/base/dragdrop/file_info",
+    "//ui/base/clipboard:file_info",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//url",

diff --git a/ui/base/clipboard/BUILD.gn b/ui/base/clipboard/BUILD.gn
@@ -54,6 +54,19 @@ component("clipboard_types") {
   }
 }
 
+component("file_info") {
+  output_name = "ui_base_file_info"
+
+  sources = [
+    "file_info.cc",
+    "file_info.h",
+  ]
+
+  defines = [ "IS_UI_BASE_FILE_INFO_IMPL" ]
+
+  deps = [ "//base" ]
+}
+
 component("clipboard") {
   output_name = "ui_base_clipboard"
 

diff --git a/ui/base/dragdrop/file_info/file_info.cc → ui/base/clipboard/file_info.cc b/ui/base/dragdrop/file_info/file_info.cc → ui/base/clipboard/file_info.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 "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 
 namespace ui {
 

diff --git a/ui/base/dragdrop/file_info/file_info.h → ui/base/clipboard/file_info.h b/ui/base/dragdrop/file_info/file_info.h → ui/base/clipboard/file_info.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_BASE_DRAGDROP_FILE_INFO_FILE_INFO_H_
-#define UI_BASE_DRAGDROP_FILE_INFO_FILE_INFO_H_
+#ifndef UI_BASE_CLIPBOARD_FILE_INFO_H_
+#define UI_BASE_CLIPBOARD_FILE_INFO_H_
 
 #include "base/component_export.h"
 #include "base/files/file_path.h"
 
 namespace ui {
 
 // struct that bundles a file's path with an optional display name.
-struct COMPONENT_EXPORT(UI_BASE_DRAGDROP_FILE_INFO) FileInfo {
+struct COMPONENT_EXPORT(UI_BASE_FILE_INFO) FileInfo {
   FileInfo();
   FileInfo(const base::FilePath& path, const base::FilePath& display_name);
   ~FileInfo();
@@ -23,4 +23,4 @@ struct COMPONENT_EXPORT(UI_BASE_DRAGDROP_FILE_INFO) FileInfo {
 
 }  // namespace ui
 
-#endif  // UI_BASE_DRAGDROP_FILE_INFO_FILE_INFO_H_
+#endif  // UI_BASE_CLIPBOARD_FILE_INFO_H_
diff --git a/ui/base/dragdrop/file_info/BUILD.gn b/ui/base/dragdrop/file_info/BUILD.gn
diff --git a/ui/base/dragdrop/os_exchange_data_provider.h b/ui/base/dragdrop/os_exchange_data_provider.h
@@ -19,9 +19,9 @@
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/download_file_info.h"
 #include "ui/base/dragdrop/download_file_interface.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "url/gurl.h"
 
 #if defined(USE_AURA) || defined(OS_APPLE)

diff --git a/ui/base/dragdrop/os_exchange_data_provider_mac.mm b/ui/base/dragdrop/os_exchange_data_provider_mac.mm
@@ -17,9 +17,9 @@
 #include "ui/base/clipboard/clipboard_format_type.h"
 #import "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/clipboard/custom_data_helper.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_policy_controller.h"
 #import "ui/base/dragdrop/cocoa_dnd_util.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "url/gurl.h"
 
 @interface CrPasteboardItemWrapper : NSObject <NSPasteboardWriting>

diff --git a/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc b/ui/base/dragdrop/os_exchange_data_provider_non_backed.cc
@@ -13,8 +13,8 @@
 #include "build/chromeos_buildflags.h"
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "url/gurl.h"
 

diff --git a/ui/base/dragdrop/os_exchange_data_provider_non_backed.h b/ui/base/dragdrop/os_exchange_data_provider_non_backed.h
@@ -12,7 +12,7 @@
 #include "base/pickle.h"
 #include "build/build_config.h"
 #include "build/chromeos_buildflags.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data_provider.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/image/image_skia.h"

diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc
@@ -34,8 +34,8 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_policy_controller.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/geometry/point.h"

diff --git a/ui/base/dragdrop/os_exchange_data_provider_x11_unittest.cc b/ui/base/dragdrop/os_exchange_data_provider_x11_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/test/task_environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard_constants.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/gfx/x/connection.h"
 #include "ui/gfx/x/x11_atom_cache.h"

diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -13,7 +13,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider.h"
 #include "ui/events/platform/platform_event_source.h"

diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -19,7 +19,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "url/gurl.h"
 

diff --git a/ui/base/x/BUILD.gn b/ui/base/x/BUILD.gn
@@ -84,10 +84,10 @@ component("x") {
     "//ui/base:hit_test",
     "//ui/base:wm_role_names",
     "//ui/base/clipboard:clipboard_types",
+    "//ui/base/clipboard:file_info",
     "//ui/base/cursor:cursor_base",
     "//ui/base/cursor:theme_manager",
     "//ui/base/cursor/mojom:cursor_type",
-    "//ui/base/dragdrop/file_info",
     "//ui/display/util",
     "//ui/events",
     "//ui/events/devices/x11",

diff --git a/ui/base/x/x11_os_exchange_data_provider.cc b/ui/base/x/x11_os_exchange_data_provider.cc
@@ -13,8 +13,8 @@
 #include "net/base/filename_util.h"
 #include "ui/base/clipboard/clipboard_constants.h"
 #include "ui/base/clipboard/clipboard_format_type.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/data_transfer_policy/data_transfer_endpoint.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/x/x11_atom_cache.h"

diff --git a/ui/ozone/platform/wayland/DEPS b/ui/ozone/platform/wayland/DEPS
@@ -7,7 +7,7 @@ include_rules = [
   "+third_party/wayland",
   "+ui/base/clipboard/clipboard_constants.h",
   "+ui/base/dragdrop/drag_drop_types.h",
-  "+ui/base/dragdrop/file_info/file_info.h",
+  "+ui/base/clipboard/file_info.h",
   "+ui/base/dragdrop/os_exchange_data.h",
   "+ui/base/dragdrop/os_exchange_data_provider_non_backed.h",
 ]
diff --git a/ui/ozone/platform/wayland/common/data_util.cc b/ui/ozone/platform/wayland/common/data_util.cc
@@ -12,7 +12,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard_constants.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_non_backed.h"
 #include "ui/ozone/public/platform_clipboard.h"

diff --git a/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc b/ui/ozone/platform/wayland/host/wayland_data_drag_controller_unittest.cc
@@ -14,9 +14,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard_constants.h"
+#include "ui/base/clipboard/file_info.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/file_info/file_info.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/gfx/geometry/point.h"