diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
| commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
| tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/components/pref_registry | |
| parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
| download | qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz | |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/pref_registry')
5 files changed, 11 insertions, 6 deletions
diff --git a/chromium/components/pref_registry/BUILD.gn b/chromium/components/pref_registry/BUILD.gn index 77ef6cd35dc..1b32529bda0 100644 --- a/chromium/components/pref_registry/BUILD.gn +++ b/chromium/components/pref_registry/BUILD.gn @@ -11,6 +11,7 @@ static_library("pref_registry") { deps = [ "//base", "//base/third_party/dynamic_annotations", + "//build:chromeos_buildflags", "//components/prefs", ] } diff --git a/chromium/components/pref_registry/DIR_METADATA b/chromium/components/pref_registry/DIR_METADATA new file mode 100644 index 00000000000..1b859d641e2 --- /dev/null +++ b/chromium/components/pref_registry/DIR_METADATA @@ -0,0 +1,5 @@ +monorail { + component: "UI>Browser>Preferences" +} + +team_email: "chromium-dev@chromium.org" diff --git a/chromium/components/pref_registry/OWNERS b/chromium/components/pref_registry/OWNERS index ef0ab79b6c7..a4dab038d55 100644 --- a/chromium/components/pref_registry/OWNERS +++ b/chromium/components/pref_registry/OWNERS @@ -1,5 +1,2 @@ battre@chromium.org gab@chromium.org - -# COMPONENT: UI>Browser>Preferences -# TEAM: chromium-dev@chromium.org diff --git a/chromium/components/pref_registry/pref_registry_syncable.cc b/chromium/components/pref_registry/pref_registry_syncable.cc index 1834568b6bd..a7861d5344e 100644 --- a/chromium/components/pref_registry/pref_registry_syncable.cc +++ b/chromium/components/pref_registry/pref_registry_syncable.cc @@ -7,13 +7,14 @@ #include "base/files/file_path.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" +#include "build/chromeos_buildflags.h" #include "components/prefs/default_pref_store.h" namespace user_prefs { namespace { constexpr uint32_t kSyncablePrefFlags = -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_CHROMEOS_ASH) PrefRegistrySyncable::SYNCABLE_OS_PREF | PrefRegistrySyncable::SYNCABLE_OS_PRIORITY_PREF | #endif @@ -37,7 +38,7 @@ void PrefRegistrySyncable::OnPrefRegistered(const std::string& path, // SYNCABLE_PRIORITY_PREF flags at the same time. DCHECK(!(flags & PrefRegistrySyncable::SYNCABLE_PREF) || !(flags & PrefRegistrySyncable::SYNCABLE_PRIORITY_PREF)); -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_CHROMEOS_ASH) // Ditto for the mutually exclusive OS pref flags. DCHECK(!(flags & PrefRegistrySyncable::SYNCABLE_OS_PREF) || !(flags & PrefRegistrySyncable::SYNCABLE_OS_PRIORITY_PREF)); diff --git a/chromium/components/pref_registry/pref_registry_syncable.h b/chromium/components/pref_registry/pref_registry_syncable.h index 0535b03c3ce..d2de43986f6 100644 --- a/chromium/components/pref_registry/pref_registry_syncable.h +++ b/chromium/components/pref_registry/pref_registry_syncable.h @@ -11,6 +11,7 @@ #include "base/callback.h" #include "base/macros.h" +#include "build/chromeos_buildflags.h" #include "components/prefs/pref_registry_simple.h" // TODO(tfarina): Change this namespace to pref_registry. @@ -49,7 +50,7 @@ class PrefRegistrySyncable : public PrefRegistrySimple { // -- they are preferred for receiving server-provided data. SYNCABLE_PRIORITY_PREF = 1 << 1, -#if defined(OS_CHROMEOS) +#if BUILDFLAG(IS_CHROMEOS_ASH) // As above, but the pref is for an OS settings (e.g. keyboard layout). // This distinction allows OS pref sync to be controlled independently from // browser pref sync in the UI. |