[go: nahoru, domu]

Revert "Reland "Load QuickOffice manifest from cros rootfs""

This reverts commit 336415fa902298ba2f5e0da9d962fd61dedff5d8.

Reason for revert: suspect causing browser_tests failure on linux-chromeos-chrome

browser_tests failed because of:
All/FileTasksBrowserTest.FallbackSucceedsWithQuickOffice/Guest
All/FileTasksBrowserTest.FallbackSucceedsWithQuickOffice/Regular
All/FileTasksBrowserTest.QuickOffice/Guest
All/FileTasksBrowserTest.QuickOffice/Incognito
...6 more failure(s) (10 total)...

The first build failure:
https://ci.chromium.org/ui/p/chrome/builders/ci/linux-chromeos-chrome/37099/overview

Original change's description:
> Reland "Load QuickOffice manifest from cros rootfs"
>
> This reverts commit 05780297d2cd6230f32d3671022366447da79f73.
>
> Reason for revert: Fixed compile error
>
> Original change's description:
> > Revert "Load QuickOffice manifest from cros rootfs"
> >
> > This reverts commit a1b9a2a855e11df2b04d6643c459e3fec2a8ebe6.
> >
> > Reason for revert: suspect causing compile failure on lacros-arm32-rel-ready bot.
> >
> > First build failure:
> > https://ci.chromium.org/ui/p/chrome/builders/ci/lacros-arm32-rel-ready/17628/overview
> >
> > Sample log:
> > ../../chrome/browser/extensions/component_loader.cc:550:7: error: use of undeclared identifier 'AddComponentFromDirWithManifestFilename'
> > AddComponentFromDirWithManifestFilename(
> > ^
> > 1 error generated.
> >
> > Original change's description:
> > > Load QuickOffice manifest from cros rootfs
> > >
> > > QuickOffice will change in crrev.com/c/5014644 to load all files
> > > including manifest.json into rootfs at
> > > /usr/share/chromeos-assets/quickoffice.
> > >
> > > CrOS will load all files directly from gcs rather than using the
> > > chromium repo submodule. There will be no need to keep
> > > chrome/browser/resources/chromeos/quickoffice.
> > >
> > > Bug: 1491571
> > > Change-Id: I1f1de7cc1c4950b4fd30d1bab8300faf6b7e8494
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5013290
> > > Commit-Queue: Joel Hockey <joelhockey@chromium.org>
> > > Reviewed-by: Dominick Ng <dominickn@chromium.org>
> > > Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
> > > Cr-Commit-Position: refs/heads/main@{#1222566}
> >
> > Bug: 1491571
> > Change-Id: Ifdc07c1b1b21caf0bf5ad35913bb1c2a12dd3f51
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5017114
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Owners-Override: Takashi Sakamoto <tasak@google.com>
> > Commit-Queue: Takashi Sakamoto <tasak@google.com>
> > Cr-Commit-Position: refs/heads/main@{#1222647}
>
> Bug: 1491571
> Change-Id: Ifed4ad16a0e646a23a2da62e06483cf47af1ea2b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5018558
> Reviewed-by: Takashi Sakamoto <tasak@google.com>
> Commit-Queue: Joel Hockey <joelhockey@chromium.org>
> Reviewed-by: Dominick Ng <dominickn@chromium.org>
> Owners-Override: Takashi Sakamoto <tasak@google.com>
> Cr-Commit-Position: refs/heads/main@{#1222715}

Bug: 1491571
Change-Id: I771e0ccc0e1e9e1213c494746345085338e9868d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5017601
Owners-Override: Takashi Sakamoto <tasak@google.com>
Commit-Queue: Takashi Sakamoto <tasak@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1222771}
diff --git a/.gitmodules b/.gitmodules
index 8f49c126..5091812 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -607,6 +607,10 @@
 	path = chrome/browser/nearby_sharing/internal
 	url = https://chrome-internal.googlesource.com/chrome/browser/nearby_sharing/internal.git
 	gclient-condition = checkout_src_internal
+[submodule "chrome/browser/resources/chromeos/quickoffice"]
+	path = chrome/browser/resources/chromeos/quickoffice
+	url = https://chrome-internal.googlesource.com/quickoffice/crx.git
+	gclient-condition = (checkout_chromeos or checkout_linux) and checkout_src_internal
 [submodule "chrome/browser/resources/settings_internal"]
 	path = chrome/browser/resources/settings_internal
 	url = https://chrome-internal.googlesource.com/chrome/browser/resources/settings_internal.git