Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2577)

Unified Diff: extensions/browser/api/serial/serial_connection.cc

Issue 2644543003: Rename device.serial.ParityBit.NO to avoid a clash with NO in objective C. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/serial/serial_io_handler_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/serial/serial_connection.cc
diff --git a/extensions/browser/api/serial/serial_connection.cc b/extensions/browser/api/serial/serial_connection.cc
index db7e6197e6759313b042546a3224bc5151e14920..adf1e4aa753e7b2f380ba2c4212339df8f963e07 100644
--- a/extensions/browser/api/serial/serial_connection.cc
+++ b/extensions/browser/api/serial/serial_connection.cc
@@ -98,7 +98,7 @@ api::serial::ParityBit ConvertParityBitFromMojo(
return api::serial::PARITY_BIT_NONE;
case device::serial::ParityBit::ODD:
return api::serial::PARITY_BIT_ODD;
- case device::serial::ParityBit::NO:
+ case device::serial::ParityBit::NO_PARITY:
return api::serial::PARITY_BIT_NO;
case device::serial::ParityBit::EVEN:
return api::serial::PARITY_BIT_EVEN;
@@ -111,7 +111,7 @@ device::serial::ParityBit ConvertParityBitToMojo(api::serial::ParityBit input) {
case api::serial::PARITY_BIT_NONE:
return device::serial::ParityBit::NONE;
case api::serial::PARITY_BIT_NO:
- return device::serial::ParityBit::NO;
+ return device::serial::ParityBit::NO_PARITY;
case api::serial::PARITY_BIT_ODD:
return device::serial::ParityBit::ODD;
case api::serial::PARITY_BIT_EVEN:
« no previous file with comments | « device/serial/serial_io_handler_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698