summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/printing/print_system_task_proxy.cc2
-rw-r--r--printing/backend/cups_helper.cc2
-rw-r--r--printing/backend/cups_helper_unittest.cc10
-rw-r--r--printing/backend/print_backend.cc2
-rw-r--r--printing/backend/print_backend.h2
-rw-r--r--printing/backend/print_backend_win.cc12
6 files changed, 15 insertions, 15 deletions
diff --git a/chrome/browser/printing/print_system_task_proxy.cc b/chrome/browser/printing/print_system_task_proxy.cc
index a7fc80f..e3a924f 100644
--- a/chrome/browser/printing/print_system_task_proxy.cc
+++ b/chrome/browser/printing/print_system_task_proxy.cc
@@ -137,7 +137,7 @@ void PrintSystemTaskProxy::GetPrinterCapabilities(
DictionaryValue settings_info;
settings_info.SetString(kPrinterId, printer_name);
- settings_info.SetBoolean(kDisableColorOption, !info.color_capable);
+ settings_info.SetBoolean(kDisableColorOption, !info.color_changeable);
settings_info.SetBoolean(printing::kSettingSetColorAsDefault,
info.color_default);
// TODO(gene): Make new capabilities format for Print Preview
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index 8153307..5b500e7 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -382,7 +382,7 @@ bool parsePpdCapabilities(
VLOG(1) << "Unknown printer color model";
}
- caps.color_capable = (cm_color && cm_black && (cm_color != cm_black));
+ caps.color_changeable = (cm_color && cm_black && (cm_color != cm_black));
caps.color_default = is_color;
ppdClose(ppd);
diff --git a/printing/backend/cups_helper_unittest.cc b/printing/backend/cups_helper_unittest.cc
index d83b3b7..7a111e3 100644
--- a/printing/backend/cups_helper_unittest.cc
+++ b/printing/backend/cups_helper_unittest.cc
@@ -33,7 +33,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexLongEdge) {
printing::PrinterSemanticCapsAndDefaults caps;
EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
- EXPECT_FALSE(caps.color_capable);
+ EXPECT_FALSE(caps.color_changeable);
EXPECT_FALSE(caps.color_default);
EXPECT_TRUE(caps.duplex_capable);
EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
@@ -58,7 +58,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorDuplexSimples) {
printing::PrinterSemanticCapsAndDefaults caps;
EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
- EXPECT_FALSE(caps.color_capable);
+ EXPECT_FALSE(caps.color_changeable);
EXPECT_FALSE(caps.color_default);
EXPECT_TRUE(caps.duplex_capable);
EXPECT_EQ(caps.duplex_default, printing::SIMPLEX);
@@ -82,7 +82,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingNoColorNoDuplex) {
printing::PrinterSemanticCapsAndDefaults caps;
EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
- EXPECT_FALSE(caps.color_capable);
+ EXPECT_FALSE(caps.color_changeable);
EXPECT_FALSE(caps.color_default);
EXPECT_FALSE(caps.duplex_capable);
EXPECT_EQ(caps.duplex_default, printing::UNKNOWN_DUPLEX_MODE);
@@ -115,7 +115,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorTrueDuplexLongEdge) {
printing::PrinterSemanticCapsAndDefaults caps;
EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
- EXPECT_TRUE(caps.color_capable);
+ EXPECT_TRUE(caps.color_changeable);
EXPECT_TRUE(caps.color_default);
EXPECT_TRUE(caps.duplex_capable);
EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
@@ -152,7 +152,7 @@ TEST(PrintBackendCupsHelperTest, TestPpdParsingColorFalseDuplexLongEdge) {
printing::PrinterSemanticCapsAndDefaults caps;
EXPECT_TRUE(printing::parsePpdCapabilities("test", test_ppd_data, &caps));
- EXPECT_TRUE(caps.color_capable);
+ EXPECT_TRUE(caps.color_changeable);
EXPECT_FALSE(caps.color_default);
EXPECT_TRUE(caps.duplex_capable);
EXPECT_EQ(caps.duplex_default, printing::LONG_EDGE);
diff --git a/printing/backend/print_backend.cc b/printing/backend/print_backend.cc
index ad3ef1b..ab8ae5f 100644
--- a/printing/backend/print_backend.cc
+++ b/printing/backend/print_backend.cc
@@ -25,7 +25,7 @@ PrinterBasicInfo::PrinterBasicInfo()
PrinterBasicInfo::~PrinterBasicInfo() {}
PrinterSemanticCapsAndDefaults::PrinterSemanticCapsAndDefaults()
- : color_capable(false),
+ : color_changeable(false),
duplex_capable(false),
color_default(false),
duplex_default(UNKNOWN_DUPLEX_MODE) {}
diff --git a/printing/backend/print_backend.h b/printing/backend/print_backend.h
index 127caf5..df9e622 100644
--- a/printing/backend/print_backend.h
+++ b/printing/backend/print_backend.h
@@ -39,7 +39,7 @@ struct PRINTING_EXPORT PrinterSemanticCapsAndDefaults {
~PrinterSemanticCapsAndDefaults();
// Capabilities.
- bool color_capable;
+ bool color_changeable;
bool duplex_capable;
// Current defaults.
diff --git a/printing/backend/print_backend_win.cc b/printing/backend/print_backend_win.cc
index e6b229a..76b68fa 100644
--- a/printing/backend/print_backend_win.cc
+++ b/printing/backend/print_backend_win.cc
@@ -120,11 +120,11 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
// Get printer capabilities. For more info see here:
// http://msdn.microsoft.com/en-us/library/windows/desktop/dd183552(v=vs.85).aspx
- caps.color_capable = (::DeviceCapabilities(info_5.get()->pPrinterName,
- info_5.get()->pPortName,
- DC_COLORDEVICE,
- NULL,
- NULL) == 1);
+ caps.color_changeable = (::DeviceCapabilities(info_5.get()->pPrinterName,
+ info_5.get()->pPortName,
+ DC_COLORDEVICE,
+ NULL,
+ NULL) == 1);
caps.duplex_capable = (::DeviceCapabilities(info_5.get()->pPrinterName,
info_5.get()->pPortName,
@@ -155,7 +155,7 @@ bool PrintBackendWin::GetPrinterSemanticCapsAndDefaults(
}
} else {
LOG(WARNING) << "Fallback to color/simplex mode.";
- caps.color_default = caps.color_capable;
+ caps.color_default = caps.color_changeable;
caps.duplex_default = SIMPLEX;
}
generated by cgit v1.1 at 2025-02-05 04:32:15 +0000