Commit 960996fe authored by Nikita Podguzov's avatar Nikita Podguzov Committed by Commit Bot

Rename DeviceNativePrinters prefs to match existing policies names.

Bug: 807068
Change-Id: I00d910ee1fc84c08d1bbab4638d70dd2df7848e4
Reviewed-on: https://chromium-review.googlesource.com/c/1336131Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Reviewed-by: default avatarMattias Nissler <mnissler@chromium.org>
Commit-Queue: Nikita Podguzov <nikitapodguzov@google.com>
Cr-Commit-Position: refs/heads/master@{#608410}
parent 16784deb
...@@ -76,10 +76,10 @@ const char* const kKnownSettings[] = { ...@@ -76,10 +76,10 @@ const char* const kKnownSettings[] = {
kDeviceLoginScreenLocales, kDeviceLoginScreenLocales,
kDeviceOffHours, kDeviceOffHours,
kDeviceOwner, kDeviceOwner,
kDevicePrintersAccessMode, kDeviceNativePrinters,
kDevicePrintersBlacklist, kDeviceNativePrintersAccessMode,
kDevicePrintersConfigurations, kDeviceNativePrintersBlacklist,
kDevicePrintersWhitelist, kDeviceNativePrintersWhitelist,
kDeviceQuirksDownloadEnabled, kDeviceQuirksDownloadEnabled,
kDeviceUnaffiliatedCrostiniAllowed, kDeviceUnaffiliatedCrostiniAllowed,
kDeviceWallpaperImage, kDeviceWallpaperImage,
......
...@@ -3793,7 +3793,7 @@ ...@@ -3793,7 +3793,7 @@
} }
}, },
"pref_mappings": [{ "pref_mappings": [{
"pref": "cros.device.printer_configurations", "pref": "cros.device.native_printers",
"local_state": true "local_state": true
}] }]
}, },
...@@ -3804,7 +3804,7 @@ ...@@ -3804,7 +3804,7 @@
"DeviceNativePrintersAccessMode": 1 "DeviceNativePrintersAccessMode": 1
}, },
"pref_mappings": [ "pref_mappings": [
{ "pref": "cros.device.printers_access_mode" } { "pref": "cros.device.native_printers_access_mode" }
] ]
}, },
...@@ -3814,7 +3814,7 @@ ...@@ -3814,7 +3814,7 @@
"DeviceNativePrintersBlacklist": ["id4", "id7", "id10"] "DeviceNativePrintersBlacklist": ["id4", "id7", "id10"]
}, },
"pref_mappings": [ "pref_mappings": [
{ "pref": "cros.device.printers_blacklist" } { "pref": "cros.device.native_printers_blacklist" }
] ]
}, },
"DeviceNativePrintersWhitelist": { "DeviceNativePrintersWhitelist": {
...@@ -3823,7 +3823,7 @@ ...@@ -3823,7 +3823,7 @@
"DeviceNativePrintersWhitelist": ["id4", "id7", "id10"] "DeviceNativePrintersWhitelist": ["id4", "id7", "id10"]
}, },
"pref_mappings": [ "pref_mappings": [
{ "pref": "cros.device.printers_whitelist" } { "pref": "cros.device.native_printers_whitelist" }
] ]
}, },
......
...@@ -270,16 +270,18 @@ const char kFineGrainedTimeZoneResolveEnabled[] = ...@@ -270,16 +270,18 @@ const char kFineGrainedTimeZoneResolveEnabled[] =
const char kDeviceOffHours[] = "cros.device_off_hours"; const char kDeviceOffHours[] = "cros.device_off_hours";
// An external data pref for the printer configurations download. // An external data pref for the printer configurations download.
const char kDevicePrintersConfigurations[] = const char kDeviceNativePrinters[] = "cros.device.native_printers";
"cros.device.printer_configurations";
// An enum specifying the access policy device printers should observe. // An enum specifying the access policy device printers should observe.
const char kDevicePrintersAccessMode[] = "cros.device.printers_access_mode"; const char kDeviceNativePrintersAccessMode[] =
"cros.device.native_printers_access_mode";
// A list of strings representing device printer ids for which access is // A list of strings representing device printer ids for which access is
// restricted. // restricted.
const char kDevicePrintersBlacklist[] = "cros.device.printers_blacklist"; const char kDeviceNativePrintersBlacklist[] =
"cros.device.native_printers_blacklist";
// A list of strings representing the list of device printer ids which are // A list of strings representing the list of device printer ids which are
// accessible. // accessible.
const char kDevicePrintersWhitelist[] = "cros.device.printers_whitelist"; const char kDeviceNativePrintersWhitelist[] =
"cros.device.native_printers_whitelist";
// A dictionary containing parameters controlling the TPM firmware update // A dictionary containing parameters controlling the TPM firmware update
// functionality. // functionality.
......
...@@ -124,10 +124,10 @@ CHROMEOS_EXPORT extern const char kFineGrainedTimeZoneResolveEnabled[]; ...@@ -124,10 +124,10 @@ CHROMEOS_EXPORT extern const char kFineGrainedTimeZoneResolveEnabled[];
CHROMEOS_EXPORT extern const char kDeviceOffHours[]; CHROMEOS_EXPORT extern const char kDeviceOffHours[];
CHROMEOS_EXPORT extern const char kDevicePrintersConfigurations[]; CHROMEOS_EXPORT extern const char kDeviceNativePrinters[];
CHROMEOS_EXPORT extern const char kDevicePrintersAccessMode[]; CHROMEOS_EXPORT extern const char kDeviceNativePrintersAccessMode[];
CHROMEOS_EXPORT extern const char kDevicePrintersBlacklist[]; CHROMEOS_EXPORT extern const char kDeviceNativePrintersBlacklist[];
CHROMEOS_EXPORT extern const char kDevicePrintersWhitelist[]; CHROMEOS_EXPORT extern const char kDeviceNativePrintersWhitelist[];
CHROMEOS_EXPORT extern const char kTPMFirmwareUpdateSettings[]; CHROMEOS_EXPORT extern const char kTPMFirmwareUpdateSettings[];
......
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