diff options
author | jamesr <jamesr@chromium.org> | 2014-11-18 17:35:28 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 01:35:49 +0000 |
commit | a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f (patch) | |
tree | 954602a17f1bfd7fd9d10c255360f75a6ada0d28 /mojo/edk/system/platform_handle_dispatcher.cc | |
parent | 558999147d4fdfd1ae7ee79cfa1c6599eab47d57 (diff) | |
download | chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.zip chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.gz chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.bz2 |
Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a
Includes updates to ipc/mojo/ipc_channel_mojo.cc for mojo::embedder API
changes and updates to use mojo::Binding<> in ui/keyboard and
device/battery.
Review URL: https://codereview.chromium.org/728133002
Cr-Commit-Position: refs/heads/master@{#304731}
Diffstat (limited to 'mojo/edk/system/platform_handle_dispatcher.cc')
-rw-r--r-- | mojo/edk/system/platform_handle_dispatcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/edk/system/platform_handle_dispatcher.cc b/mojo/edk/system/platform_handle_dispatcher.cc index a6072cf..f064c67 100644 --- a/mojo/edk/system/platform_handle_dispatcher.cc +++ b/mojo/edk/system/platform_handle_dispatcher.cc @@ -43,7 +43,7 @@ scoped_refptr<PlatformHandleDispatcher> PlatformHandleDispatcher::Deserialize( embedder::PlatformHandleVector* platform_handles) { if (size != sizeof(SerializedPlatformHandleDispatcher)) { LOG(ERROR) << "Invalid serialized platform handle dispatcher (bad size)"; - return scoped_refptr<PlatformHandleDispatcher>(); + return nullptr; } const SerializedPlatformHandleDispatcher* serialization = @@ -58,7 +58,7 @@ scoped_refptr<PlatformHandleDispatcher> PlatformHandleDispatcher::Deserialize( platform_handle_index >= platform_handles->size()) { LOG(ERROR) << "Invalid serialized platform handle dispatcher (missing handles)"; - return scoped_refptr<PlatformHandleDispatcher>(); + return nullptr; } // We take ownership of the handle, so we have to invalidate the one in |