Files SWA: Move mojo files to their own directory.

Bug: 1113981
Change-Id: I90081b67e4e1cc4313e8a9c441ac05fed7ba7320
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437715Reviewed-by: Sam McNally <sammc@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Sergei Datsenko <dats@chromium.org>
Commit-Queue: Bo Majewski <majewski@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816319}

chrome/browser/BUILD.gn

@@ -2322,8 +2322,8 @@ static_library("browser") {
     ]
     if (!is_official_build) {
       deps += [
-        "//chromeos/components/file_manager:file_manager_mojom",
         "//chromeos/components/file_manager:file_manager_ui",
+        "//chromeos/components/file_manager/mojom",
         "//chromeos/components/telemetry_extension_ui",
         "//chromeos/components/telemetry_extension_ui/mojom",
       ]

chrome/browser/chrome_browser_interface_binders.cc

@@ -196,11 +196,11 @@
 #endif
 
 #if defined(OS_CHROMEOS) && !defined(OFFICIAL_BUILD)
-#include "chromeos/components/file_manager/file_manager.mojom.h"
 #include "chromeos/components/file_manager/file_manager_ui.h"
+#include "chromeos/components/file_manager/mojom/file_manager.mojom.h"
 #include "chromeos/components/telemetry_extension_ui/mojom/diagnostics_service.mojom.h"  // nogncheck crbug.com/1125897
 #include "chromeos/components/telemetry_extension_ui/mojom/probe_service.mojom.h"  // nogncheck crbug.com/1125897
-#include "chromeos/components/telemetry_extension_ui/mojom/system_events_service.mojom.h" // nogncheck crbug.com/1125897
+#include "chromeos/components/telemetry_extension_ui/mojom/system_events_service.mojom.h"  // nogncheck crbug.com/1125897
 #include "chromeos/components/telemetry_extension_ui/telemetry_extension_ui.h"
 #endif
 

chromeos/components/file_manager/BUILD.gn

@@ -2,19 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
-
 assert(is_chromeos, "File Manager is Chrome OS only")
 assert(!is_official_build, "File Manager is only built for unofficial builds")
 
-mojom("file_manager_mojom") {
-  sources = [ "file_manager.mojom" ]
+static_library("file_manager_page_handler") {
+  sources = [
+    "file_manager_page_handler.cc",
+    "file_manager_page_handler.h",
+  ]
+
+  deps = [ "//chromeos/components/file_manager/mojom" ]
 }
 
 static_library("file_manager_ui") {
   sources = [
-    "file_manager_page_handler.cc",
-    "file_manager_page_handler.h",
     "file_manager_ui.cc",
     "file_manager_ui.h",
     "url_constants.cc",
@@ -22,7 +23,8 @@ static_library("file_manager_ui") {
   ]
 
   deps = [
-    ":file_manager_mojom",
+    ":file_manager_page_handler",
+    "//chromeos/components/file_manager/mojom",
     "//chromeos/constants",
     "//chromeos/resources:file_manager_resources",
     "//content/public/browser",

chromeos/components/file_manager/OWNERS

 file://ui/file_manager/OWNERS
 
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
-
 # COMPONENT: Platform>Apps>FileManager

chromeos/components/file_manager/file_manager_page_handler.h

@@ -9,7 +9,7 @@
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
-#include "chromeos/components/file_manager/file_manager.mojom.h"
+#include "chromeos/components/file_manager/mojom/file_manager.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"

chromeos/components/file_manager/file_manager_ui.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "chromeos/components/file_manager/file_manager.mojom.h"
+#include "chromeos/components/file_manager/mojom/file_manager.mojom.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver.h"

chromeos/components/file_manager/mojom/BUILD.gn

+# Copyright 2020 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("//mojo/public/tools/bindings/mojom.gni")
+
+assert(is_chromeos, "File Manager is Chrome OS only")
+assert(!is_official_build, "File Manager is only built for unofficial builds")
+
+mojom("mojom") {
+  sources = [ "file_manager.mojom" ]
+}

chromeos/components/file_manager/mojom/OWNERS

+per-file *.mojom=set noparent
+per-file *.mojom=file://ipc/SECURITY_OWNERS
+
+# COMPONENT: Platform>Apps>FileManager

chromeos/components/file_manager/resources/BUILD.gn

@@ -9,7 +9,9 @@ js_library("main_js") {
     "browser_proxy.js",
     "main.js",
   ]
-  deps = [ "//chromeos/components/file_manager:file_manager_mojom_js_library_for_compile" ]
+  deps = [
+    "//chromeos/components/file_manager/mojom:mojom_js_library_for_compile",
+  ]
 }
 
 js_type_check("closure_compile") {

chromeos/components/file_manager/resources/file_manager_resources.grd

@@ -22,7 +22,7 @@
 
         <!-- Mojo resources -->
         <include name="IDR_FILE_MANAGER_MOJO_LITE_JS"
-          file="$root_gen_dir\chromeos\components\file_manager\file_manager.mojom-lite.js"
+          file="$root_gen_dir\chromeos\components\file_manager\mojom\file_manager.mojom-lite.js"
           use_base_dir="false"
           type="BINDATA" />
       </if>

chromeos/resources/BUILD.gn

@@ -85,7 +85,7 @@ if (!is_official_build) {
     ]
 
     deps = [
-      "//chromeos/components/file_manager:file_manager_mojom_js",
+      "//chromeos/components/file_manager/mojom:mojom_js",
       "//mojo/public/js:bindings_lite",
     ]
   }