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

Side by Side Diff: mojo/edk/embedder/embedder.cc

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 5 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 unified diff | Download patch
« no previous file with comments | « mojo/edk/embedder/embedder.h ('k') | mojo/edk/embedder/embedder_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "mojo/edk/embedder/embedder.h" 5 #include "mojo/edk/embedder/embedder.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 if (dispatcher->GetType() != system::Dispatcher::kTypePlatformHandle) 201 if (dispatcher->GetType() != system::Dispatcher::kTypePlatformHandle)
202 return MOJO_RESULT_INVALID_ARGUMENT; 202 return MOJO_RESULT_INVALID_ARGUMENT;
203 203
204 *platform_handle = 204 *platform_handle =
205 static_cast<system::PlatformHandleDispatcher*>(dispatcher.get()) 205 static_cast<system::PlatformHandleDispatcher*>(dispatcher.get())
206 ->PassPlatformHandle() 206 ->PassPlatformHandle()
207 .Pass(); 207 .Pass();
208 return MOJO_RESULT_OK; 208 return MOJO_RESULT_OK;
209 } 209 }
210 210
211 MojoResult AsyncWait(MojoHandle handle,
212 MojoHandleSignals signals,
213 base::Callback<void(MojoResult)> callback) {
214 return internal::g_core->AsyncWait(handle, signals, callback);
215 }
216
211 } // namespace embedder 217 } // namespace embedder
212 } // namespace mojo 218 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/edk/embedder/embedder.h ('k') | mojo/edk/embedder/embedder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698