components/arc/arc_service_manager.cc - Issue 2078683002: Add handler and mojo interface to accept android intent filters.

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/arc_service_manager.cc

Issue 2078683002: Add handler and mojo interface to accept android intent filters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Store intent filers in LocalActivityResolver. Created 4 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 | « components/arc/arc_service_manager.h ('k') | components/arc/common/intent_helper.mojom » ('j') | components/arc/intent_helper/local_activity_resolver.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/arc/arc_service_manager.cc

diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc

index be6d1ee29771c5a9174b92dd2415646d00dfc08f..1425d19bb41663cca8fa695d60ea8ead89f93ec0 100644

--- a/components/arc/arc_service_manager.cc

+++ b/components/arc/arc_service_manager.cc

@@ -60,8 +60,9 @@ ArcServiceManager::ArcServiceManager(

base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));

AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));

icon_loader_ = new ActivityIconLoader;

- AddService(base::WrapUnique(

- new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_)));

+ activity_resolver_ = new LocalActivityResolver;

Yusuke Sato 2016/06/17 21:51:15 This code is fine, but it conflicts with a recent

zentaro 2016/06/17 23:37:35 Done.

+ AddService(base::WrapUnique(new ArcIntentHelperBridge(

+ arc_bridge_service(), icon_loader_, activity_resolver_)));

AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));

AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));

AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));

@@ -121,6 +122,7 @@ void ArcServiceManager::OnAshStarted() {

void ArcServiceManager::Shutdown() {

icon_loader_ = nullptr;

+ activity_resolver_ = nullptr;

services_.clear();

}