Move site_engagement.mojom to chrome/browser/engagement.
To allow use of the same SiteEngagementInfo structure by both the site
engagement UI and the important sites implementation, this CL moves the
Mojo definitions out of c/b/ui/webui/engagement.
BUG=703848
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
Review-Url: https://codereview.chromium.org/2783433003
Cr-Commit-Position: refs/heads/master@{#460248}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 6bee5f7a..770f1f2 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4258,7 +4258,7 @@
# Depend only on the generated mojo bindings since we read the .mojom.js
# file, rather than the whole mojo target which will link the C++ bindings.
"//chrome/app:chrome_content_manifest_overlays",
- "//chrome/browser/ui/webui/engagement:mojo_bindings__generator",
+ "//chrome/browser/engagement:mojo_bindings__generator",
"//chrome/browser/ui/webui/omnibox:mojo_bindings__generator",
"//chrome/browser/ui/webui/usb_internals:mojo_bindings__generator",
"//device/bluetooth/public/interfaces:experimental_interfaces__generator",
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 83dc971..0ffecb8 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -439,7 +439,7 @@
<include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flattenhtml="true" type="BINDATA" compress="gzip" />
<include name="IDR_SITE_ENGAGEMENT_HTML" file="resources\engagement\site_engagement.html" flattenhtml="true" type="BINDATA" compress="gzip" />
<include name="IDR_SITE_ENGAGEMENT_JS" file="resources\engagement\site_engagement.js" flattenhtml="true" type="BINDATA" compress="gzip" />
- <include name="IDR_SITE_ENGAGEMENT_MOJO_JS" file="${root_gen_dir}\chrome\browser\ui\webui\engagement\site_engagement.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
+ <include name="IDR_SITE_ENGAGEMENT_MOJO_JS" file="${root_gen_dir}\chrome\browser\engagement\site_engagement.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
<include name="IDR_URL_MOJO_JS" file="${root_gen_dir}\url\mojo\url.mojom.js" use_base_dir="false" type="BINDATA" compress="gzip" />
<include name="IDR_SYNC_CONFIRMATION_CSS" file="resources\signin\sync_confirmation\sync_confirmation.css" type="BINDATA" />
<include name="IDR_SYNC_CONFIRMATION_HTML" file="resources\signin\sync_confirmation\sync_confirmation.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
diff --git a/chrome/browser/ui/webui/engagement/BUILD.gn b/chrome/browser/engagement/BUILD.gn
similarity index 100%
rename from chrome/browser/ui/webui/engagement/BUILD.gn
rename to chrome/browser/engagement/BUILD.gn
diff --git a/chrome/browser/engagement/OWNERS b/chrome/browser/engagement/OWNERS
index 123948b..42c7f53 100644
--- a/chrome/browser/engagement/OWNERS
+++ b/chrome/browser/engagement/OWNERS
@@ -1,3 +1,6 @@
+per-file *.mojom=set noparent
+per-file *.mojom=file://ipc/SECURITY_OWNERS
+
[email protected]
[email protected]
[email protected]
diff --git a/chrome/browser/ui/webui/engagement/site_engagement.mojom b/chrome/browser/engagement/site_engagement.mojom
similarity index 100%
rename from chrome/browser/ui/webui/engagement/site_engagement.mojom
rename to chrome/browser/engagement/site_engagement.mojom
diff --git a/chrome/browser/resources/engagement/site_engagement.js b/chrome/browser/resources/engagement/site_engagement.js
index 3557fd0..f8c7cccc 100644
--- a/chrome/browser/resources/engagement/site_engagement.js
+++ b/chrome/browser/resources/engagement/site_engagement.js
@@ -5,7 +5,7 @@
'use strict';
define('main', [
- 'chrome/browser/ui/webui/engagement/site_engagement.mojom',
+ 'chrome/browser/engagement/site_engagement.mojom',
'content/public/renderer/frame_interfaces',
], function(siteEngagementMojom, frameInterfaces) {
return function() {
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index a33d66e..5c38159 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -479,7 +479,7 @@
"//chrome/app/theme:theme_resources",
"//chrome/browser:resource_prefetch_predictor_proto",
"//chrome/browser/devtools",
- "//chrome/browser/ui/webui/engagement:mojo_bindings",
+ "//chrome/browser/engagement:mojo_bindings",
"//chrome/browser/ui/webui/omnibox:mojo_bindings",
"//chrome/browser/ui/webui/usb_internals:mojo_bindings",
"//chrome/common",
diff --git a/chrome/browser/ui/webui/engagement/OWNERS b/chrome/browser/ui/webui/engagement/OWNERS
deleted file mode 100644
index 08850f4..0000000
--- a/chrome/browser/ui/webui/engagement/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-per-file *.mojom=set noparent
-per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
index c0ff308c..2321fc1 100644
--- a/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
+++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.cc
@@ -82,9 +82,8 @@
std::unique_ptr<content::WebUIDataSource> source(
content::WebUIDataSource::Create(chrome::kChromeUISiteEngagementHost));
source->AddResourcePath("site_engagement.js", IDR_SITE_ENGAGEMENT_JS);
- source->AddResourcePath(
- "chrome/browser/ui/webui/engagement/site_engagement.mojom",
- IDR_SITE_ENGAGEMENT_MOJO_JS);
+ source->AddResourcePath("chrome/browser/engagement/site_engagement.mojom",
+ IDR_SITE_ENGAGEMENT_MOJO_JS);
source->AddResourcePath("url/mojo/url.mojom", IDR_URL_MOJO_JS);
source->SetDefaultResource(IDR_SITE_ENGAGEMENT_HTML);
source->UseGzip(std::unordered_set<std::string>());
diff --git a/chrome/browser/ui/webui/engagement/site_engagement_ui.h b/chrome/browser/ui/webui/engagement/site_engagement_ui.h
index 5b406e8c..2580c89 100644
--- a/chrome/browser/ui/webui/engagement/site_engagement_ui.h
+++ b/chrome/browser/ui/webui/engagement/site_engagement_ui.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_WEBUI_ENGAGEMENT_SITE_ENGAGEMENT_UI_H_
#include "base/macros.h"
-#include "chrome/browser/ui/webui/engagement/site_engagement.mojom.h"
+#include "chrome/browser/engagement/site_engagement.mojom.h"
#include "chrome/browser/ui/webui/mojo_web_ui_controller.h"
// The UI for chrome://site-engagement/.
