| commit | 5097e9c3be27f9c7b4b53f18ca5c05f9bbd58c46 | [log] [tgz] |
|---|---|---|
| author | Yeunjoo Choi <[email protected]> | Thu Feb 25 08:46:52 2021 |
| committer | Chromium LUCI CQ <[email protected]> | Thu Feb 25 08:46:52 2021 |
| tree | 65774c19a7043654eb185c80d92129c68ae5a3e4 | |
| parent | 634ac637e76b11400431da08f2fccdec4fbd3ae6 [diff] [blame] |
Reland "Move //chrome/browser/{chromeos => ash}/settings"
This is a reland of d53715c5ce9b44dbbb67326d347038c4e429db76
Reason for revert:
The moved OWNER path doesn't update to other OWNERs and FindIt
idendifies as culprit for failures in the build.
Original change's description:
> Move //chrome/browser/{chromeos => ash}/settings
>
> This CL is part of the Chrome OS source code directory migration:
> https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.
>
> Bug: 1164001
> Change-Id: I43364f65c41d9435f66185eeb9832a452565958c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2706661
> Reviewed-by: Hidehiko Abe <[email protected]>
> Reviewed-by: James Cook <[email protected]>
> Owners-Override: Hidehiko Abe <[email protected]>
> Commit-Queue: Yeunjoo Choi <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#857018}
Bug: 1164001
Change-Id: I481aad7cd7bb9c66439bd340071600a767d50318
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2717423
Reviewed-by: Hidehiko Abe <[email protected]>
Owners-Override: Hidehiko Abe <[email protected]>
Commit-Queue: Yeunjoo Choi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#857587}
diff --git a/chrome/browser/ui/webui/help/help_utils_chromeos.cc b/chrome/browser/ui/webui/help/help_utils_chromeos.cc index caefb308..cfddc57 100644 --- a/chrome/browser/ui/webui/help/help_utils_chromeos.cc +++ b/chrome/browser/ui/webui/help/help_utils_chromeos.cc
@@ -11,7 +11,7 @@ #include "ash/constants/ash_switches.h" #include "base/logging.h" #include "base/values.h" -#include "chrome/browser/chromeos/settings/cros_settings.h" +#include "chrome/browser/ash/settings/cros_settings.h" #include "chromeos/settings/cros_settings_names.h" namespace help_utils_chromeos {