summaryrefslogtreecommitdiffstats
path: root/device/serial
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2015-08-24 10:24:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 17:24:56 +0000
commitb6a14b7a0263778a0f04a0c6999d6737f5ee2a0a (patch)
tree069b72b9890c254d29af2d0b10de7035505a7616 /device/serial
parent8bd9e806da07493c0fc48c8ff257a899281f1be5 (diff)
downloadchromium_src-b6a14b7a0263778a0f04a0c6999d6737f5ee2a0a.zip
chromium_src-b6a14b7a0263778a0f04a0c6999d6737f5ee2a0a.tar.gz
chromium_src-b6a14b7a0263778a0f04a0c6999d6737f5ee2a0a.tar.bz2
Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598
Re-land number two. Now with cherry-picked android test fix. BUG=None TBR=jam@chromium.org,ben@chromium.org TBR=mfoltz@chromium.org TBR=mek@chromium.org TBR=xhwang@chromium.org TBR=shess@chromium.org Review URL: https://codereview.chromium.org/1311043003 Cr-Commit-Position: refs/heads/master@{#345106}
Diffstat (limited to 'device/serial')
-rw-r--r--device/serial/data_receiver.h1
-rw-r--r--device/serial/data_sink_receiver.h1
-rw-r--r--device/serial/data_source_sender.h1
3 files changed, 3 insertions, 0 deletions
diff --git a/device/serial/data_receiver.h b/device/serial/data_receiver.h
index 774d395..0eba0a2 100644
--- a/device/serial/data_receiver.h
+++ b/device/serial/data_receiver.h
@@ -13,6 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "device/serial/buffer.h"
#include "device/serial/data_stream.mojom.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
namespace device {
diff --git a/device/serial/data_sink_receiver.h b/device/serial/data_sink_receiver.h
index 8bb306e..733b0a1 100644
--- a/device/serial/data_sink_receiver.h
+++ b/device/serial/data_sink_receiver.h
@@ -13,6 +13,7 @@
#include "base/memory/weak_ptr.h"
#include "device/serial/buffer.h"
#include "device/serial/data_stream.mojom.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
namespace device {
diff --git a/device/serial/data_source_sender.h b/device/serial/data_source_sender.h
index 2de7ce6..160dec9 100644
--- a/device/serial/data_source_sender.h
+++ b/device/serial/data_source_sender.h
@@ -12,6 +12,7 @@
#include "base/memory/weak_ptr.h"
#include "device/serial/buffer.h"
#include "device/serial/data_stream.mojom.h"
+#include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
#include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"
namespace device {