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

Unified Diff: chrome/browser/extensions/api/serial/serial_io_handler.cc

Issue 363583002: Convert SerialIoHandler to use Mojo types. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove "default" case Created 6 years, 6 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
Index: chrome/browser/extensions/api/serial/serial_io_handler.cc
diff --git a/chrome/browser/extensions/api/serial/serial_io_handler.cc b/chrome/browser/extensions/api/serial/serial_io_handler.cc
index 98d51f736ce144aef2cbe40fefc7837dd519f2bb..12485f29a336d727dd1c33f433986d3bd1fecdad 100644
--- a/chrome/browser/extensions/api/serial/serial_io_handler.cc
+++ b/chrome/browser/extensions/api/serial/serial_io_handler.cc
@@ -119,7 +119,7 @@ void SerialIoHandler::Write(const std::string& data) {
}
void SerialIoHandler::ReadCompleted(int bytes_read,
- api::serial::ReceiveError error) {
+ device::serial::ReceiveError error) {
DCHECK(CalledOnValidThread());
DCHECK(IsReadPending());
read_complete_.Run(std::string(pending_read_buffer_->data(), bytes_read),
@@ -130,7 +130,7 @@ void SerialIoHandler::ReadCompleted(int bytes_read,
}
void SerialIoHandler::WriteCompleted(int bytes_written,
- api::serial::SendError error) {
+ device::serial::SendError error) {
DCHECK(CalledOnValidThread());
DCHECK(IsWritePending());
write_complete_.Run(bytes_written, error);
@@ -149,7 +149,7 @@ bool SerialIoHandler::IsWritePending() const {
return pending_write_buffer_ != NULL;
}
-void SerialIoHandler::CancelRead(api::serial::ReceiveError reason) {
+void SerialIoHandler::CancelRead(device::serial::ReceiveError reason) {
DCHECK(CalledOnValidThread());
if (IsReadPending()) {
read_canceled_ = true;
@@ -158,7 +158,7 @@ void SerialIoHandler::CancelRead(api::serial::ReceiveError reason) {
}
}
-void SerialIoHandler::CancelWrite(api::serial::SendError reason) {
+void SerialIoHandler::CancelWrite(device::serial::SendError reason) {
DCHECK(CalledOnValidThread());
if (IsWritePending()) {
write_canceled_ = true;
@@ -168,14 +168,14 @@ void SerialIoHandler::CancelWrite(api::serial::SendError reason) {
}
void SerialIoHandler::QueueReadCompleted(int bytes_read,
- api::serial::ReceiveError error) {
+ device::serial::ReceiveError error) {
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&SerialIoHandler::ReadCompleted, this,
bytes_read, error));
}
void SerialIoHandler::QueueWriteCompleted(int bytes_written,
- api::serial::SendError error) {
+ device::serial::SendError error) {
base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(&SerialIoHandler::WriteCompleted, this,
bytes_written, error));

Powered by Google App Engine
This is Rietveld 408576698