Skip to content

GitLab

T
tangled
Commit 036b9b66 authored by Steven Bennetts's avatar Steven Bennetts Committed by Commit Bot
Browse files
Options

Make //chromeos/settings a component 

This includes some deps cleanup of //chromeos.

For explicit DEPS extraction:
TBR=sky@chromium.org

Bug: 918682
Change-Id: I551c9a78284e86aef229f7c12e9b8611d4514c07
Reviewed-on: https://chromium-review.googlesource.com/c/1405968
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarA Olsen <olsen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622052}
parent 5c29504c
Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 164 deletions
ash/BUILD.gn
View file @ 036b9b66
...@@ -1378,6 +1378,7 @@ component("ash") { ...@@ -1378,6 +1378,7 @@ component("ash") {
"//chromeos/services/assistant/public:feature_flags", "//chromeos/services/assistant/public:feature_flags",
"//chromeos/services/assistant/public/mojom", "//chromeos/services/assistant/public/mojom",
"//chromeos/services/multidevice_setup/public/mojom", "//chromeos/services/multidevice_setup/public/mojom",
"//chromeos/settings",
"//chromeos/strings", "//chromeos/strings",
"//components/account_id", "//components/account_id",
"//components/device_event_log", "//components/device_event_log",
......
chrome/browser/chromeos/BUILD.gn
View file @ 036b9b66
...@@ -115,6 +115,7 @@ source_set("chromeos") { ...@@ -115,6 +115,7 @@ source_set("chromeos") {
"//chromeos/services/multidevice_setup/public/cpp:oobe_completion_tracker", "//chromeos/services/multidevice_setup/public/cpp:oobe_completion_tracker",
"//chromeos/services/multidevice_setup/public/cpp:prefs", "//chromeos/services/multidevice_setup/public/cpp:prefs",
"//chromeos/services/secure_channel/public/cpp/client", "//chromeos/services/secure_channel/public/cpp/client",
"//chromeos/settings",
"//chromeos/timezone", "//chromeos/timezone",
"//chromeos/tpm", "//chromeos/tpm",
"//components/arc", "//components/arc",
...@@ -2073,6 +2074,7 @@ static_library("test_support") { ...@@ -2073,6 +2074,7 @@ static_library("test_support") {
"//chromeos/components/drivefs", "//chromeos/components/drivefs",
"//chromeos/components/drivefs:test_support", "//chromeos/components/drivefs:test_support",
"//chromeos/dbus", "//chromeos/dbus",
"//chromeos/settings",
"//components/crx_file", "//components/crx_file",
"//components/drive", "//components/drive",
"//components/policy/proto", "//components/policy/proto",
......
chrome/browser/extensions/BUILD.gn
View file @ 036b9b66
...@@ -966,6 +966,7 @@ jumbo_static_library("extensions") { ...@@ -966,6 +966,7 @@ jumbo_static_library("extensions") {
"//chromeos/services/machine_learning/public/cpp", "//chromeos/services/machine_learning/public/cpp",
"//chromeos/services/machine_learning/public/mojom", "//chromeos/services/machine_learning/public/mojom",
"//chromeos/services/media_perception/public/mojom", "//chromeos/services/media_perception/public/mojom",
"//chromeos/settings",
"//chromeos/tpm", "//chromeos/tpm",
"//components/arc", "//components/arc",
"//components/constrained_window", "//components/constrained_window",
......
chrome/browser/ui/BUILD.gn
View file @ 036b9b66
...@@ -1762,6 +1762,7 @@ jumbo_split_static_library("ui") { ...@@ -1762,6 +1762,7 @@ jumbo_split_static_library("ui") {
"//chromeos/services/multidevice_setup/public/cpp:prefs", "//chromeos/services/multidevice_setup/public/cpp:prefs",
"//chromeos/services/multidevice_setup/public/cpp:url_provider", "//chromeos/services/multidevice_setup/public/cpp:url_provider",
"//chromeos/services/multidevice_setup/public/mojom", "//chromeos/services/multidevice_setup/public/mojom",
"//chromeos/settings",
"//chromeos/strings", "//chromeos/strings",
"//components/arc", "//components/arc",
"//components/captive_portal", "//components/captive_portal",
......
chromeos/BUILD.gn
View file @ 036b9b66
...@@ -28,16 +28,12 @@ component("chromeos") { ...@@ -28,16 +28,12 @@ component("chromeos") {
public_deps = [ public_deps = [
":chromeos_constants", ":chromeos_constants",
":chromeos_export", ":chromeos_export",
"//chromeos/settings",
] ]
deps = [ deps = [
":account_manager_proto", ":account_manager_proto",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//components/device_event_log",
"//components/policy/proto", "//components/policy/proto",
"//components/pref_registry",
"//components/prefs",
"//google_apis", "//google_apis",
"//services/network/public/cpp:cpp", "//services/network/public/cpp:cpp",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
...@@ -151,7 +147,6 @@ source_set("test_support_source_set") { ...@@ -151,7 +147,6 @@ source_set("test_support_source_set") {
public_deps = [ public_deps = [
":chromeos", ":chromeos",
":test_utils", ":test_utils",
"//chromeos/network:test_support",
] ]
deps = [ deps = [
"//chromeos/attestation:test_support", "//chromeos/attestation:test_support",
...@@ -160,6 +155,7 @@ source_set("test_support_source_set") { ...@@ -160,6 +155,7 @@ source_set("test_support_source_set") {
"//chromeos/disks:test_support", "//chromeos/disks:test_support",
"//chromeos/login/auth:test_support", "//chromeos/login/auth:test_support",
"//chromeos/login/login_state:test_support", "//chromeos/login/login_state:test_support",
"//chromeos/network:test_support",
"//google_apis", "//google_apis",
"//net:test_support", "//net:test_support",
"//services/network:test_support", "//services/network:test_support",
......
chromeos/settings/BUILD.gn
View file @ 036b9b66
...@@ -2,25 +2,22 @@ ...@@ -2,25 +2,22 @@
# 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.
import("//build/config/chromeos/rules.gni")
import("//testing/test.gni") import("//testing/test.gni")
assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos") assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
source_set("settings") { component("settings") {
configs += [ "//chromeos:chromeos_implementation" ] defines = [ "IS_CHROMEOS_SETTINGS_IMPL" ]
public_deps = [
":cros_settings_names",
]
deps = [ deps = [
"//base", "//base",
"//base:i18n", "//base:i18n",
"//chromeos:chromeos_constants", "//chromeos:chromeos_constants",
"//chromeos:chromeos_export",
"//chromeos/login/login_state", "//chromeos/login/login_state",
"//third_party/icu", "//third_party/icu",
] ]
sources = [ sources = [
"cros_settings_names.cc",
"cros_settings_names.h",
"cros_settings_provider.cc", "cros_settings_provider.cc",
"cros_settings_provider.h", "cros_settings_provider.h",
"system_settings_provider.cc", "system_settings_provider.cc",
...@@ -32,17 +29,6 @@ source_set("settings") { ...@@ -32,17 +29,6 @@ source_set("settings") {
] ]
} }
source_set("cros_settings_names") {
configs += [ "//chromeos:chromeos_implementation" ]
deps = [
"//chromeos:chromeos_export",
]
sources = [
"cros_settings_names.cc",
"cros_settings_names.h",
]
}
source_set("unit_tests") { source_set("unit_tests") {
testonly = true testonly = true
deps = [ deps = [
......
chromeos/settings/DEPS 0 → 100644
View file @ 036b9b66
noparent = True
include_rules = [
"+base",
"+chromeos/constants",
"+chromeos/login/login_state",
"+third_party/icu",
]
specific_include_rules = {
".*test\.cc|mock.*\.*": [
"+testing",
],
}
chromeos/settings/cros_settings_names.h
View file @ 036b9b66
...@@ -5,161 +5,210 @@ ...@@ -5,161 +5,210 @@
#ifndef CHROMEOS_SETTINGS_CROS_SETTINGS_NAMES_H_ #ifndef CHROMEOS_SETTINGS_CROS_SETTINGS_NAMES_H_
#define CHROMEOS_SETTINGS_CROS_SETTINGS_NAMES_H_ #define CHROMEOS_SETTINGS_CROS_SETTINGS_NAMES_H_
#include "chromeos/chromeos_export.h" #include "base/component_export.h"
namespace chromeos { namespace chromeos {
CHROMEOS_EXPORT extern const char kCrosSettingsPrefix[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kCrosSettingsPrefix[];
CHROMEOS_EXPORT extern const char kAccountsPrefAllowGuest[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kAccountsPrefAllowGuest[];
CHROMEOS_EXPORT extern const char kAccountsPrefAllowNewUser[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kAccountsPrefShowUserNamesOnSignIn[]; extern const char kAccountsPrefAllowNewUser[];
CHROMEOS_EXPORT extern const char kAccountsPrefUsers[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kAccountsPrefEphemeralUsersEnabled[]; extern const char kAccountsPrefShowUserNamesOnSignIn[];
CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccounts[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kAccountsPrefUsers[];
CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccountsKeyId[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccountsKeyType[]; extern const char kAccountsPrefEphemeralUsersEnabled[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyKioskAppId[]; extern const char kAccountsPrefDeviceLocalAccounts[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL[]; extern const char kAccountsPrefDeviceLocalAccountsKeyId[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyArcKioskPackage[]; extern const char kAccountsPrefDeviceLocalAccountsKeyType[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyArcKioskClass[]; extern const char kAccountsPrefDeviceLocalAccountsKeyKioskAppId[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyArcKioskAction[]; extern const char kAccountsPrefDeviceLocalAccountsKeyKioskAppUpdateURL[];
CHROMEOS_EXPORT extern const char COMPONENT_EXPORT(CHROMEOS_SETTINGS)
kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName[]; extern const char kAccountsPrefDeviceLocalAccountsKeyArcKioskPackage[];
CHROMEOS_EXPORT extern const char kAccountsPrefDeviceLocalAccountAutoLoginId[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char extern const char kAccountsPrefDeviceLocalAccountsKeyArcKioskClass[];
kAccountsPrefDeviceLocalAccountAutoLoginDelay[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char extern const char kAccountsPrefDeviceLocalAccountsKeyArcKioskAction[];
kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char extern const char kAccountsPrefDeviceLocalAccountsKeyArcKioskDisplayName[];
kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kAccountsPrefSupervisedUsersEnabled[]; extern const char kAccountsPrefDeviceLocalAccountAutoLoginId[];
CHROMEOS_EXPORT extern const char kAccountsPrefTransferSAMLCookies[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kAccountsPrefLoginScreenDomainAutoComplete[]; extern const char kAccountsPrefDeviceLocalAccountAutoLoginDelay[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAccountsPrefDeviceLocalAccountPromptForNetworkWhenOffline[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAccountsPrefSupervisedUsersEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAccountsPrefTransferSAMLCookies[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAccountsPrefLoginScreenDomainAutoComplete[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kSignedDataRoamingEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kUpdateDisabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kTargetVersionPrefix[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAllowedConnectionTypesForUpdate[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kSystemTimezonePolicy[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kSystemTimezone[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kSystemUse24HourClock[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceOwner[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kStatsReportingPref[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReleaseChannel[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReleaseChannelDelegated[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceVersionInfo[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceActivityTimes[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceBoardStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportDeviceBootMode[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportDeviceLocation[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceNetworkInterfaces[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDevicePowerStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceStorageStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportDeviceUsers[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceHardwareStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kReportDeviceSessionStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportOsUpdateStatus[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportRunningKioskApp[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kReportUploadFrequency[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kHeartbeatEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kHeartbeatFrequency[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kSystemLogUploadEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kPolicyMissingMitigationMode[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAllowRedeemChromeOsRegistrationOffers[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kStartUpFlags[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kKioskAppSettingsPrefix[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const int kKioskAppSettingsPrefixLength;
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kKioskApps[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kKioskAutoLaunch[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kKioskDisableBailoutShortcut[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kVariationsRestrictParameter[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceAttestationEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kAttestationForContentProtectionEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kServiceAccountIdentity[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceDisabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceDisabledMessage[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kRebootOnShutdown[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kExtensionCacheSize[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolution[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyExternalWidth[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyExternalHeight[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyExternalScale[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyExternalUseNative[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyInternalScale[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceDisplayResolutionKeyRecommended[];
CHROMEOS_EXPORT extern const char kSignedDataRoamingEnabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDisplayRotationDefault[];
CHROMEOS_EXPORT extern const char kUpdateDisabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kTargetVersionPrefix[]; extern const char kLoginAuthenticationBehavior[];
CHROMEOS_EXPORT extern const char kAllowedConnectionTypesForUpdate[];
CHROMEOS_EXPORT extern const char kSystemTimezonePolicy[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kAllowBluetooth[];
CHROMEOS_EXPORT extern const char kSystemTimezone[];
CHROMEOS_EXPORT extern const char kSystemUse24HourClock[];
CHROMEOS_EXPORT extern const char kDeviceOwner[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceQuirksDownloadEnabled[];
CHROMEOS_EXPORT extern const char kStatsReportingPref[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kLoginVideoCaptureAllowedUrls[];
CHROMEOS_EXPORT extern const char kReleaseChannel[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kReleaseChannelDelegated[]; extern const char kDeviceLoginScreenAppInstallList[];
CHROMEOS_EXPORT extern const char kReportDeviceVersionInfo[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceWallpaperImage[];
CHROMEOS_EXPORT extern const char kReportDeviceActivityTimes[];
CHROMEOS_EXPORT extern const char kReportDeviceBoardStatus[];
CHROMEOS_EXPORT extern const char kReportDeviceBootMode[];
CHROMEOS_EXPORT extern const char kReportDeviceLocation[];
CHROMEOS_EXPORT extern const char kReportDeviceNetworkInterfaces[];
CHROMEOS_EXPORT extern const char kReportDevicePowerStatus[];
CHROMEOS_EXPORT extern const char kReportDeviceStorageStatus[];
CHROMEOS_EXPORT extern const char kReportDeviceUsers[];
CHROMEOS_EXPORT extern const char kReportDeviceHardwareStatus[];
CHROMEOS_EXPORT extern const char kReportDeviceSessionStatus[];
CHROMEOS_EXPORT extern const char kReportOsUpdateStatus[];
CHROMEOS_EXPORT extern const char kReportRunningKioskApp[];
CHROMEOS_EXPORT extern const char kReportUploadFrequency[];
CHROMEOS_EXPORT extern const char kHeartbeatEnabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kHeartbeatFrequency[]; extern const char kDeviceLoginScreenLocales[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceLoginScreenInputMethods[];
CHROMEOS_EXPORT extern const char kSystemLogUploadEnabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kPerUserTimezoneEnabled[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kFineGrainedTimeZoneResolveEnabled[];
CHROMEOS_EXPORT extern const char kPolicyMissingMitigationMode[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceOffHours[];
CHROMEOS_EXPORT extern const char kAllowRedeemChromeOsRegistrationOffers[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceNativePrinters[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceNativePrintersAccessMode[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceNativePrintersBlacklist[];
COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceNativePrintersWhitelist[];
CHROMEOS_EXPORT extern const char kStartUpFlags[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kTPMFirmwareUpdateSettings[];
CHROMEOS_EXPORT extern const char kKioskAppSettingsPrefix[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const int kKioskAppSettingsPrefixLength; extern const char kMinimumRequiredChromeVersion[];
CHROMEOS_EXPORT extern const char kKioskApps[];
CHROMEOS_EXPORT extern const char kKioskAutoLaunch[];
CHROMEOS_EXPORT extern const char kKioskDisableBailoutShortcut[];
CHROMEOS_EXPORT extern const char kVariationsRestrictParameter[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kCastReceiverName[];
CHROMEOS_EXPORT extern const char kDeviceAttestationEnabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kUnaffiliatedArcAllowed[];
CHROMEOS_EXPORT extern const char kAttestationForContentProtectionEnabled[];
CHROMEOS_EXPORT extern const char kServiceAccountIdentity[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kDeviceHostnameTemplate[];
CHROMEOS_EXPORT extern const char kDeviceDisabled[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kVirtualMachinesAllowed[];
CHROMEOS_EXPORT extern const char kDeviceDisabledMessage[];
CHROMEOS_EXPORT extern const char kRebootOnShutdown[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kSamlLoginAuthenticationType[];
CHROMEOS_EXPORT extern const char kExtensionCacheSize[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
extern const char kDeviceAutoUpdateTimeRestrictions[];
CHROMEOS_EXPORT extern const char kDeviceDisplayResolution[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS)
CHROMEOS_EXPORT extern const char kDeviceDisplayResolutionKeyExternalWidth[]; extern const char kDeviceUnaffiliatedCrostiniAllowed[];
CHROMEOS_EXPORT extern const char kDeviceDisplayResolutionKeyExternalHeight[];
CHROMEOS_EXPORT extern const char kDeviceDisplayResolutionKeyExternalScale[];
CHROMEOS_EXPORT extern const char
kDeviceDisplayResolutionKeyExternalUseNative[];
CHROMEOS_EXPORT extern const char kDeviceDisplayResolutionKeyInternalScale[];
CHROMEOS_EXPORT extern const char kDeviceDisplayResolutionKeyRecommended[];
CHROMEOS_EXPORT extern const char kDisplayRotationDefault[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kPluginVmAllowed[];
CHROMEOS_EXPORT extern const char kLoginAuthenticationBehavior[];
CHROMEOS_EXPORT extern const char kAllowBluetooth[];
CHROMEOS_EXPORT extern const char kDeviceQuirksDownloadEnabled[];
CHROMEOS_EXPORT extern const char kLoginVideoCaptureAllowedUrls[];
CHROMEOS_EXPORT extern const char kDeviceLoginScreenAppInstallList[];
CHROMEOS_EXPORT extern const char kDeviceWallpaperImage[];
CHROMEOS_EXPORT extern const char kDeviceLoginScreenLocales[];
CHROMEOS_EXPORT extern const char kDeviceLoginScreenInputMethods[];
CHROMEOS_EXPORT extern const char kPerUserTimezoneEnabled[];
CHROMEOS_EXPORT extern const char kFineGrainedTimeZoneResolveEnabled[];
CHROMEOS_EXPORT extern const char kDeviceOffHours[];
CHROMEOS_EXPORT extern const char kDeviceNativePrinters[];
CHROMEOS_EXPORT extern const char kDeviceNativePrintersAccessMode[];
CHROMEOS_EXPORT extern const char kDeviceNativePrintersBlacklist[];
CHROMEOS_EXPORT extern const char kDeviceNativePrintersWhitelist[];
CHROMEOS_EXPORT extern const char kTPMFirmwareUpdateSettings[];
CHROMEOS_EXPORT extern const char kMinimumRequiredChromeVersion[];
CHROMEOS_EXPORT extern const char kCastReceiverName[];
CHROMEOS_EXPORT extern const char kUnaffiliatedArcAllowed[];
CHROMEOS_EXPORT extern const char kDeviceHostnameTemplate[];
CHROMEOS_EXPORT extern const char kVirtualMachinesAllowed[];
CHROMEOS_EXPORT extern const char kSamlLoginAuthenticationType[];
CHROMEOS_EXPORT extern const char kDeviceAutoUpdateTimeRestrictions[];
CHROMEOS_EXPORT extern const char kDeviceUnaffiliatedCrostiniAllowed[];
CHROMEOS_EXPORT extern const char kPluginVmAllowed[];
} // namespace chromeos } // namespace chromeos
......
chromeos/settings/cros_settings_provider.h
View file @ 036b9b66
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include <string> #include <string>
#include "base/callback.h" #include "base/callback.h"
#include "chromeos/chromeos_export.h" #include "base/component_export.h"
namespace base { namespace base {
class Value; class Value;
...@@ -16,7 +16,7 @@ class Value; ...@@ -16,7 +16,7 @@ class Value;
namespace chromeos { namespace chromeos {
class CHROMEOS_EXPORT CrosSettingsProvider { class COMPONENT_EXPORT(CHROMEOS_SETTINGS) CrosSettingsProvider {
public: public:
// The callback type that is called to notify the CrosSettings observers // The callback type that is called to notify the CrosSettings observers
// about a setting change. // about a setting change.
......
chromeos/settings/system_settings_provider.h
View file @ 036b9b66
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include <string> #include <string>
#include "base/callback.h" #include "base/callback.h"
#include "base/component_export.h"
#include "base/macros.h" #include "base/macros.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/settings/cros_settings_provider.h" #include "chromeos/settings/cros_settings_provider.h"
#include "chromeos/settings/timezone_settings.h" #include "chromeos/settings/timezone_settings.h"
#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/icu/source/i18n/unicode/timezone.h"
...@@ -21,7 +21,7 @@ class Value; ...@@ -21,7 +21,7 @@ class Value;
namespace chromeos { namespace chromeos {
class CHROMEOS_EXPORT SystemSettingsProvider class COMPONENT_EXPORT(CHROMEOS_SETTINGS) SystemSettingsProvider
: public CrosSettingsProvider, : public CrosSettingsProvider,
public system::TimezoneSettings::Observer { public system::TimezoneSettings::Observer {
public: public:
......
chromeos/settings/timezone_settings.h
View file @ 036b9b66
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include <vector> #include <vector>
#include "base/component_export.h"
#include "base/strings/string16.h" #include "base/strings/string16.h"
#include "chromeos/chromeos_export.h"
#include "chromeos/settings/cros_settings_provider.h" #include "chromeos/settings/cros_settings_provider.h"
#include "third_party/icu/source/i18n/unicode/timezone.h" #include "third_party/icu/source/i18n/unicode/timezone.h"
...@@ -16,10 +16,10 @@ namespace chromeos { ...@@ -16,10 +16,10 @@ namespace chromeos {
namespace system { namespace system {
// Canonical name of UTC timezone. // Canonical name of UTC timezone.
CHROMEOS_EXPORT extern const char kUTCTimezoneName[]; COMPONENT_EXPORT(CHROMEOS_SETTINGS) extern const char kUTCTimezoneName[];
// This interface provides access to Chrome OS timezone settings. // This interface provides access to Chrome OS timezone settings.
class CHROMEOS_EXPORT TimezoneSettings { class COMPONENT_EXPORT(CHROMEOS_SETTINGS) TimezoneSettings {
public: public:
class Observer { class Observer {
public: public:
......
chromeos/settings/timezone_settings_helper.cc
View file @ 036b9b66
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
#include "chromeos/settings/timezone_settings_helper.h" #include "chromeos/settings/timezone_settings_helper.h"
#include "base/component_export.h"
#include "base/logging.h" #include "base/logging.h"
#include "chromeos/chromeos_export.h"
namespace chromeos { namespace chromeos {
namespace system { namespace system {
CHROMEOS_EXPORT const icu::TimeZone* GetKnownTimezoneOrNull( COMPONENT_EXPORT(CHROMEOS_SETTINGS)
const icu::TimeZone* GetKnownTimezoneOrNull(
const icu::TimeZone& timezone, const icu::TimeZone& timezone,
const std::vector<std::unique_ptr<icu::TimeZone>>& timezone_list) { const std::vector<std::unique_ptr<icu::TimeZone>>& timezone_list) {
const icu::TimeZone* known_timezone = nullptr; const icu::TimeZone* known_timezone = nullptr;
......
services/device/time_zone_monitor/BUILD.gn
View file @ 036b9b66
...@@ -41,7 +41,7 @@ source_set("time_zone_monitor") { ...@@ -41,7 +41,7 @@ source_set("time_zone_monitor") {
} }
if (is_chromeos) { if (is_chromeos) {
deps += [ "//chromeos" ] deps += [ "//chromeos/settings" ]
} }
if (is_mac) { if (is_mac) {
......
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