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

Side by Side Diff: components/message_port/web_message_port_channel_impl.cc

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « components/message_port/web_message_port_channel_impl.h ('k') | components/mus/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/message_port/web_message_port_channel_impl.h" 5 #include "components/message_port/web_message_port_channel_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "mojo/public/cpp/system/message_pipe.h"
10 #include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h" 11 #include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h"
11 #include "third_party/WebKit/public/platform/WebString.h" 12 #include "third_party/WebKit/public/platform/WebString.h"
12 #include "third_party/mojo/src/mojo/public/cpp/system/message_pipe.h"
13 13
14 using blink::WebMessagePortChannel; 14 using blink::WebMessagePortChannel;
15 using blink::WebMessagePortChannelArray; 15 using blink::WebMessagePortChannelArray;
16 using blink::WebMessagePortChannelClient; 16 using blink::WebMessagePortChannelClient;
17 using blink::WebString; 17 using blink::WebString;
18 18
19 namespace message_port { 19 namespace message_port {
20 20
21 void WebMessagePortChannelImpl::CreatePair( 21 void WebMessagePortChannelImpl::CreatePair(
22 blink::WebMessagePortChannel** channel1, 22 blink::WebMessagePortChannel** channel1,
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 return; 131 return;
132 132
133 DCHECK_EQ(MOJO_RESULT_OK, result); 133 DCHECK_EQ(MOJO_RESULT_OK, result);
134 if (!client_) 134 if (!client_)
135 return; 135 return;
136 client_->messageAvailable(); 136 client_->messageAvailable();
137 WaitForNextMessage(); 137 WaitForNextMessage();
138 } 138 }
139 139
140 } // namespace message_port 140 } // namespace message_port
OLDNEW
« no previous file with comments | « components/message_port/web_message_port_channel_impl.h ('k') | components/mus/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698