ios/web/webui/mojo_facade.mm - Issue 2522943003: [iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC.

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: ios/web/webui/mojo_facade.mm

Issue 2522943003: [iOS/ARC] Fix a violation of ODR in base::BindBlock under ARC. (Closed)

Patch Set: Use EXPECT_NSEQ instead of EXPECT_EQ/EXPECT_TRUE. Created 4 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:

Index: ios/web/webui/mojo_facade.mm

diff --git a/ios/web/webui/mojo_facade.mm b/ios/web/webui/mojo_facade.mm

index dd912ee099c77f50c93d2efbcf9220001eae939c..a0a9ff5a6e63b627137c194c99cec97273aac490 100644

--- a/ios/web/webui/mojo_facade.mm

+++ b/ios/web/webui/mojo_facade.mm

@@ -249,7 +249,8 @@ std::unique_ptr<base::Value> MojoFacade::HandleSupportWatch(

int callback_id;

CHECK(args->GetInteger("callbackId", &callback_id));

- mojo::Watcher::ReadyCallback callback = base::BindBlock(^(MojoResult result) {

+ mojo::Watcher::ReadyCallback callback = base::BindBlockArc(^(

+ MojoResult result) {

NSString* script =

[NSString stringWithFormat:@"__crWeb.mojo.signalWatch(%d, %d)",

callback_id, result];

« no previous file with comments | « ios/web/webui/crw_web_ui_manager.mm ('k') | no next file » | no next file with comments »