Commit 3d36668f authored by Ken Rockot's avatar Ken Rockot Committed by Commit Bot

chrome/services/file_util/public/{interfaces => mojom}

TBR=dcheng@chromium.org
TBR=jam@chromium.org

Bug: 806965
Change-Id: I8ffbfcaa998bfdfca4b037848309315324bd8dfd
Reviewed-on: https://chromium-review.googlesource.com/911886Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Ken Rockot <rockot@chromium.org>
Cr-Commit-Position: refs/heads/master@{#535975}
parent b0b336cf
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
#endif #endif
#if defined(FULL_SAFE_BROWSING) || defined(OS_CHROMEOS) #if defined(FULL_SAFE_BROWSING) || defined(OS_CHROMEOS)
#include "chrome/services/file_util/public/interfaces/constants.mojom.h" #include "chrome/services/file_util/public/mojom/constants.mojom.h"
#endif #endif
using base::FileDescriptor; using base::FileDescriptor;
......
...@@ -684,7 +684,7 @@ mojom("mojo_bindings") { ...@@ -684,7 +684,7 @@ mojom("mojo_bindings") {
] ]
if (safe_browsing_mode == 1) { if (safe_browsing_mode == 1) {
public_deps += [ "//chrome/services/file_util/public/interfaces" ] public_deps += [ "//chrome/services/file_util/public/mojom" ]
} }
overridden_deps = [ overridden_deps = [
......
...@@ -64,5 +64,5 @@ ...@@ -64,5 +64,5 @@
#endif #endif
#if defined(FULL_SAFE_BROWSING) #if defined(FULL_SAFE_BROWSING)
#include "chrome/services/file_util/public/interfaces/safe_archive_analyzer_param_traits.h" #include "chrome/services/file_util/public/mojom/safe_archive_analyzer_param_traits.h"
#endif #endif
...@@ -18,7 +18,7 @@ source_set("lib") { ...@@ -18,7 +18,7 @@ source_set("lib") {
] ]
public_deps = [ public_deps = [
"//chrome/services/file_util/public/interfaces", "//chrome/services/file_util/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
] ]
......
...@@ -6,7 +6,7 @@ import("//build/config/features.gni") ...@@ -6,7 +6,7 @@ import("//build/config/features.gni")
source_set("cpp") { source_set("cpp") {
public_deps = [ public_deps = [
"//chrome/services/file_util/public/interfaces", "//chrome/services/file_util/public/mojom",
"//services/service_manager/public/cpp", "//services/service_manager/public/cpp",
] ]
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/post_task.h"
#include "chrome/common/safe_browsing/archive_analyzer_results.h" #include "chrome/common/safe_browsing/archive_analyzer_results.h"
#include "chrome/services/file_util/public/interfaces/constants.mojom.h" #include "chrome/services/file_util/public/mojom/constants.mojom.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "chrome/services/file_util/public/interfaces/safe_archive_analyzer.mojom.h" #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
namespace safe_browsing { namespace safe_browsing {
struct ArchiveAnalyzerResults; struct ArchiveAnalyzerResults;
......
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/post_task.h"
#include "chrome/common/safe_browsing/archive_analyzer_results.h" #include "chrome/common/safe_browsing/archive_analyzer_results.h"
#include "chrome/services/file_util/public/interfaces/constants.mojom.h" #include "chrome/services/file_util/public/mojom/constants.mojom.h"
#include "chrome/services/file_util/public/interfaces/safe_archive_analyzer.mojom.h" #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
#include "services/service_manager/public/cpp/connector.h" #include "services/service_manager/public/cpp/connector.h"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/macros.h" #include "base/macros.h"
#include "base/memory/ref_counted.h" #include "base/memory/ref_counted.h"
#include "chrome/services/file_util/public/interfaces/safe_archive_analyzer.mojom.h" #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
namespace safe_browsing { namespace safe_browsing {
struct ArchiveAnalyzerResults; struct ArchiveAnalyzerResults;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/callback_helpers.h" #include "base/callback_helpers.h"
#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/post_task.h"
#include "chrome/services/file_util/public/interfaces/constants.mojom.h" #include "chrome/services/file_util/public/mojom/constants.mojom.h"
#include "components/filesystem/directory_impl.h" #include "components/filesystem/directory_impl.h"
#include "components/filesystem/lock_table.h" #include "components/filesystem/lock_table.h"
#include "content/public/browser/browser_thread.h" #include "content/public/browser/browser_thread.h"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "base/files/file.h" #include "base/files/file.h"
#include "base/files/file_path.h" #include "base/files/file_path.h"
#include "base/task_scheduler/post_task.h" #include "base/task_scheduler/post_task.h"
#include "chrome/services/file_util/public/interfaces/zip_file_creator.mojom.h" #include "chrome/services/file_util/public/mojom/zip_file_creator.mojom.h"
namespace service_manager { namespace service_manager {
class Connector; class Connector;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//mojo/public/tools/bindings/mojom.gni") import("//mojo/public/tools/bindings/mojom.gni")
import("//build/config/features.gni") import("//build/config/features.gni")
mojom("interfaces") { mojom("mojom") {
sources = [ sources = [
"constants.mojom", "constants.mojom",
] ]
......
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
mojom = mojom = "//chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom"
"//chrome/services/file_util/public/interfaces/safe_archive_analyzer.mojom"
public_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ] public_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ]
traits_headers = [ "//chrome/services/file_util/public/interfaces/safe_archive_analyzer_param_traits.h" ] traits_headers = [ "//chrome/services/file_util/public/mojom/safe_archive_analyzer_param_traits.h" ]
deps = [ deps = [
"//chrome/common/safe_browsing:proto", "//chrome/common/safe_browsing:proto",
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#ifndef CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_ #ifndef CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_
#define CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_ #define CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_
#include "chrome/services/file_util/public/interfaces/safe_archive_analyzer.mojom.h" #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "services/service_manager/public/cpp/service_context_ref.h" #include "services/service_manager/public/cpp/service_context_ref.h"
namespace base { namespace base {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <vector> #include <vector>
#include "chrome/services/file_util/public/interfaces/zip_file_creator.mojom.h" #include "chrome/services/file_util/public/mojom/zip_file_creator.mojom.h"
#include "components/filesystem/public/interfaces/directory.mojom.h" #include "components/filesystem/public/interfaces/directory.mojom.h"
#include "services/service_manager/public/cpp/service_context_ref.h" #include "services/service_manager/public/cpp/service_context_ref.h"
......
...@@ -6,7 +6,7 @@ typemaps = [ ...@@ -6,7 +6,7 @@ typemaps = [
"//chrome/common/browser_controls_state.typemap", "//chrome/common/browser_controls_state.typemap",
"//chrome/common/search.typemap", "//chrome/common/search.typemap",
"//chrome/common/web_application_info_provider.typemap", "//chrome/common/web_application_info_provider.typemap",
"//chrome/services/file_util/public/interfaces/safe_archive_analyzer.typemap", "//chrome/services/file_util/public/mojom/safe_archive_analyzer.typemap",
"//chrome/services/media_gallery_util/public/interfaces/media_parser.typemap", "//chrome/services/media_gallery_util/public/interfaces/media_parser.typemap",
"//chrome/services/printing/public/interfaces/pdf_render_settings.typemap", "//chrome/services/printing/public/interfaces/pdf_render_settings.typemap",
"//chrome/services/printing/public/interfaces/pdf_to_pwg_raster_converter.typemap", "//chrome/services/printing/public/interfaces/pdf_to_pwg_raster_converter.typemap",
......
...@@ -3,7 +3,7 @@ include_rules = [ ...@@ -3,7 +3,7 @@ include_rules = [
"+chrome/installer/util", "+chrome/installer/util",
"+chrome/profiling", "+chrome/profiling",
"+chrome/services/file_util/file_util_service.h", "+chrome/services/file_util/file_util_service.h",
"+chrome/services/file_util/public/interfaces", "+chrome/services/file_util/public/mojom",
"+chrome/services/media_gallery_util/media_gallery_util_service.h", "+chrome/services/media_gallery_util/media_gallery_util_service.h",
"+chrome/services/media_gallery_util/public/interfaces", "+chrome/services/media_gallery_util/public/interfaces",
# TODO(crbug.com/798782): remove dependency to pdf_to_emf_converter_factory.h # TODO(crbug.com/798782): remove dependency to pdf_to_emf_converter_factory.h
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
#if defined(FULL_SAFE_BROWSING) || defined(OS_CHROMEOS) #if defined(FULL_SAFE_BROWSING) || defined(OS_CHROMEOS)
#include "chrome/services/file_util/file_util_service.h" // nogncheck #include "chrome/services/file_util/file_util_service.h" // nogncheck
#include "chrome/services/file_util/public/interfaces/constants.mojom.h" // nogncheck #include "chrome/services/file_util/public/mojom/constants.mojom.h" // nogncheck
#endif #endif
#if BUILDFLAG(ENABLE_PRINTING) #if BUILDFLAG(ENABLE_PRINTING)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment