components/arc/intent_helper/activity_icon_loader.cc - Issue 2133503002: arc: Revamp the ArcBridgeService interface

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: components/arc/intent_helper/activity_icon_loader.cc

Issue 2133503002: arc: Revamp the ArcBridgeService interface (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: More rebasing Created 4 years, 5 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:

Index: components/arc/intent_helper/activity_icon_loader.cc

diff --git a/components/arc/intent_helper/activity_icon_loader.cc b/components/arc/intent_helper/activity_icon_loader.cc

index 8a24fe16a7338d5b93f017ff1c5e974711b5e1d8..5248f7599cbedd87481969690379fe367be47da2 100644

--- a/components/arc/intent_helper/activity_icon_loader.cc

+++ b/components/arc/intent_helper/activity_icon_loader.cc

@@ -37,13 +37,13 @@ mojom::IntentHelperInstance* GetIntentHelperInstance(

return nullptr;

}

mojom::IntentHelperInstance* intent_helper_instance =

- bridge_service->intent_helper_instance();

+ bridge_service->intent_helper()->instance();

if (!intent_helper_instance) {

VLOG(2) << "ARC intent helper instance is not ready.";

*out_error_code = ActivityIconLoader::GetResult::FAILED_ARC_NOT_READY;

return nullptr;

}

- if (bridge_service->intent_helper_version() < kMinInstanceVersion) {

+ if (bridge_service->intent_helper()->version() < kMinInstanceVersion) {

VLOG(1) << "ARC intent helper instance is too old.";

*out_error_code = ActivityIconLoader::GetResult::FAILED_ARC_NOT_SUPPORTED;

return nullptr;