Rename device.serial.ParityBit.NO to avoid a clash with NO in objecti…

…ve C. BUG=682516 Review-Url: https://codereview.chromium.org/2644543003 Cr-Commit-Position: refs/heads/master@{#444663}
Denger-Network · Jan 19, 2017 · fe5b80d · fe5b80d
1 parent 0243cf7
commit fe5b80d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/device/serial/serial.mojom b/device/serial/serial.mojom
@@ -42,7 +42,7 @@ enum DataBits {
 
 enum ParityBit {
   NONE,
-  NO,
+  NO_PARITY,
   ODD,
   EVEN,
 };

diff --git a/device/serial/serial_io_handler.cc b/device/serial/serial_io_handler.cc
@@ -27,7 +27,7 @@ SerialIoHandler::SerialIoHandler(
       ui_thread_task_runner_(ui_thread_task_runner) {
   options_.bitrate = 9600;
   options_.data_bits = serial::DataBits::EIGHT;
-  options_.parity_bit = serial::ParityBit::NO;
+  options_.parity_bit = serial::ParityBit::NO_PARITY;
   options_.stop_bits = serial::StopBits::ONE;
   options_.cts_flow_control = false;
   options_.has_cts_flow_control = true;

diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc
@@ -223,7 +223,7 @@ bool SerialIoHandlerPosix::ConfigurePortImpl() {
     case serial::ParityBit::ODD:
       config.c_cflag |= (PARODD | PARENB);
       break;
-    case serial::ParityBit::NO:
+    case serial::ParityBit::NO_PARITY:
     default:
       config.c_cflag &= ~(PARODD | PARENB);
       break;
@@ -492,7 +492,7 @@ serial::ConnectionInfoPtr SerialIoHandlerPosix::GetPortInfo() const {
     info->parity_bit = (config.c_cflag & PARODD) ? serial::ParityBit::ODD
                                                  : serial::ParityBit::EVEN;
   } else {
-    info->parity_bit = serial::ParityBit::NO;
+    info->parity_bit = serial::ParityBit::NO_PARITY;
   }
   info->stop_bits =
       (config.c_cflag & CSTOPB) ? serial::StopBits::TWO : serial::StopBits::ONE;

diff --git a/device/serial/serial_io_handler_win.cc b/device/serial/serial_io_handler_win.cc
@@ -63,7 +63,7 @@ int ParityBitEnumToConstant(serial::ParityBit parity_bit) {
       return EVENPARITY;
     case serial::ParityBit::ODD:
       return ODDPARITY;
-    case serial::ParityBit::NO:
+    case serial::ParityBit::NO_PARITY:
     default:
       return NOPARITY;
   }
@@ -125,7 +125,7 @@ serial::ParityBit ParityBitConstantToEnum(int parity_bit) {
       return serial::ParityBit::ODD;
     case NOPARITY:
     default:
-      return serial::ParityBit::NO;
+      return serial::ParityBit::NO_PARITY;
   }
 }
 

diff --git 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: