0

Remove non-versioned Stable attributes from //printing mojom files

Relax the stability requirements, since they were added for Lacros,
which has been sunset. Without the Stable attribute, the Extensible
attribute is also no longer applicable. Only remove the attributes for
non-versioned structs / enums, which is trivial.

Bug: 404905690
No-Presubmit: true
Change-Id: I9a2d3afb03b1075cc56873f97e740c1acc23d9e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6374565
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Alan Screen <awscreen@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1435701}
This commit is contained in:
Lei Zhang
2025-03-20 14:35:41 -07:00
committed by Chromium LUCI CQ
parent 3911f070fb
commit eb3a1ef353
3 changed files with 17 additions and 22 deletions
chromeos/printing
printing

@ -22,7 +22,7 @@ crosapi::mojom::PrintSettingsPtr CreatePrintSettings(int preview_id) {
print_settings->collate = false;
print_settings->copies = 1;
print_settings->color = printing::mojom::ColorModel::kColor;
print_settings->duplex = printing::mojom::DuplexMode::kDefaultValue;
print_settings->duplex = printing::mojom::DuplexMode::kUnknownDuplexMode;
print_settings->landscape = true;
print_settings->scale_factor = 1;
print_settings->rasterize_pdf = false;

@ -34,7 +34,6 @@ struct Paper {
// Media type used by printer semantic capabilities and defaults.
// Corresponds to `printing::PrinterSemanticCapsAndDefaults::MediaType` in
// printing/backend/print_backend.h.
[Stable]
struct MediaType {
string display_name;
string vendor_id;
@ -44,7 +43,7 @@ struct MediaType {
// Paper used by printer semantic capabilities and defaults.
// Corresponds to `printing::AdvancedCapabilityValue` in
// printing/backend/print_backend.h.
[Stable, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
struct AdvancedCapabilityValue {
string name;
string display_name;
@ -53,9 +52,9 @@ struct AdvancedCapabilityValue {
// The type of the values for advanced capabilities.
// Corresponds to `printing::AdvancedCapability::Type` in
// printing/backend/print_backend.h.
[Stable, Extensible, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
enum AdvancedCapabilityType {
[Default] kString,
kString,
kBoolean,
kFloat,
kInteger,
@ -64,7 +63,7 @@ enum AdvancedCapabilityType {
// An advanced capability for ChromeOS printing.
// Corresponds to `printing::AdvancedCapability` in
// printing/backend/print_backend.h.
[Stable, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
struct AdvancedCapability {
string name;
string display_name;
@ -76,7 +75,7 @@ struct AdvancedCapability {
// Attributes of a Page Output Quality of XPS printer for Windows printing.
// Corresponds to `printing::PageOutpuQualityAttribute` in
// printing/backend/print_backend.h.
[Stable, EnableIf=is_win]
[EnableIf=is_win]
struct PageOutputQualityAttribute {
string display_name;
string name;
@ -84,7 +83,7 @@ struct PageOutputQualityAttribute {
// Page Output Quality from XPS printer for Windows printing. Corresponds to
// `printing::PageOutputQuality` in printing/backend/print_backend.h.
[Stable, EnableIf=is_win]
[EnableIf=is_win]
struct PageOutputQuality {
array<PageOutputQualityAttribute> qualities; // No duplicates.
string? default_quality; // Default selection of `qualities`.

@ -54,9 +54,8 @@ enum ColorModel {
};
// Print job duplex mode values.
[Stable, Extensible]
enum DuplexMode {
[Default] kUnknownDuplexMode = -1,
kUnknownDuplexMode = -1,
kSimplex,
kLongEdge,
kShortEdge,
@ -123,10 +122,9 @@ enum GenerateDocumentOutline {
};
// What kind of margins to use.
[Stable, Extensible]
enum MarginType {
// Default varies depending on headers being enabled or not
[Default] kDefaultMargins,
kDefaultMargins,
kNoMargins,
kPrintableAreaMargins,
kCustomMargins,
@ -134,18 +132,18 @@ enum MarginType {
// Allowed printing modes as a bitmask.
// This is used in pref file and should never change.
[Stable, Extensible, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
enum ColorModeRestriction {
[Default] kUnset = 0x0,
kUnset = 0x0,
kMonochrome = 0x1,
kColor = 0x2,
};
// Allowed duplex modes as a bitmask.
// This is used in pref file and should never change.
[Stable, Extensible, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
enum DuplexModeRestriction {
[Default] kUnset = 0x0,
kUnset = 0x0,
kSimplex = 0x1,
kLongEdge = 0x2,
kShortEdge = 0x4,
@ -154,9 +152,9 @@ enum DuplexModeRestriction {
// Allowed PIN printing modes.
// This is used in pref file and should never change.
[Stable, Extensible, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
enum PinModeRestriction {
[Default] kUnset = 0,
kUnset = 0,
kPin = 1,
kNoPin = 2,
};
@ -174,7 +172,6 @@ enum ResultCode {
// Matches print_preview.PrinterType in
// chrome/browser/resources/print_preview/data/destination_match.ts
[Stable, Extensible]
enum PrinterType {
kPrivetDeprecated,
kExtension,
@ -201,14 +198,13 @@ struct PageRange {
// Corresponds to the 'client-info' IPP attribute.
// For optional fields, missing values correspond to the 'no-value' IPP
// out-of-band value.
[Stable, EnableIf=is_chromeos]
[EnableIf=is_chromeos]
struct IppClientInfo {
[Stable, Extensible]
enum ClientType {
kApplication = 3,
kOperatingSystem = 4,
kDriver = 5,
[Default] kOther = 6,
kOther = 6,
};
ClientType client_type;
string client_name;