diff options
| author | Steven Holte <holte@google.com> | 2015-05-21 19:15:01 -0700 |
|---|---|---|
| committer | Steven Holte <holte@google.com> | 2015-05-22 02:16:14 +0000 |
| commit | 0774f95f34b869875cfa0191175d50fe9a297c4a (patch) | |
| tree | fde5ab3fb24523effb92f2b1d9ebf02a49e0d5fd /mandoline | |
| parent | 756e41dd2b2d12bc8ce56db44ac950e6713f4a30 (diff) | |
| download | chromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.zip chromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.tar.gz chromium_src-0774f95f34b869875cfa0191175d50fe9a297c4a.tar.bz2 | |
Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"
This appears to cause build failure.
http://build.chromium.org/p/chromium.win/builders/Win%20x64%20GN%20%28dbg%29/builds/1908
This reverts commit 8ddc364fd10bcfe1a4332f0f66be4e5db84e39b6.
TBR=rockot,jam
BUG=
Review URL: https://codereview.chromium.org/1157573002
Cr-Commit-Position: refs/heads/master@{#331047}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/ui/aura/surface_binding.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mandoline/ui/aura/surface_binding.cc b/mandoline/ui/aura/surface_binding.cc index 6f71d1e..3f1dd1de 100644 --- a/mandoline/ui/aura/surface_binding.cc +++ b/mandoline/ui/aura/surface_binding.cc @@ -214,7 +214,7 @@ void SurfaceBinding::PerViewManagerState::Init() { base::Bind(&SurfaceBinding::PerViewManagerState::SetIdNamespace, base::Unretained(this))); // Block until we receive our id namespace. - surface_.WaitForIncomingResponse(); + surface_.WaitForIncomingMethodCall(); DCHECK_NE(0u, id_namespace_); mojo::ResourceReturnerPtr returner_ptr; |