third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h - Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/mojo/src/mojo/public/cpp/bindings/lib/connector.cc ('k') | third_party/mojo/src/mojo/public/cpp/bindings/lib/router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h

diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h b/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h

index e88084fe324a3f557f48595f44b22dec0f4a079d..5ef6742847b4634622e100ad87f32ba97439b1c2 100644

--- a/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h

+++ b/third_party/mojo/src/mojo/public/cpp/bindings/lib/interface_ptr_internal.h

@@ -7,6 +7,7 @@

#include <algorithm> // For |std::swap()|.

+#include "mojo/public/cpp/bindings/callback.h"

#include "mojo/public/cpp/bindings/interface_ptr_info.h"

#include "mojo/public/cpp/bindings/lib/control_message_proxy.h"

#include "mojo/public/cpp/bindings/lib/filter_chain.h"

@@ -111,11 +112,11 @@ class InterfacePtrState {

return router_ ? router_->encountered_error() : false;

}

- void set_error_handler(ErrorHandler* error_handler) {

+ void set_connection_error_handler(const Closure& error_handler) {

ConfigureProxyIfNecessary();

MOJO_DCHECK(router_);

- router_->set_error_handler(error_handler);

+ router_->set_connection_error_handler(error_handler);

}

Router* router_for_testing() {