chrome/browser/ui/app_list/arc/arc_app_item.cc - Issue 1534423002: Revert of arc-bridge: Move most methods to Mojo interfaces

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: chrome/browser/ui/app_list/arc/arc_app_item.cc

Issue 1534423002: Revert of arc-bridge: Move most methods to Mojo interfaces (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master

Patch Set: Created 5 years 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 | « chrome/browser/task_management/providers/arc/arc_process_task_provider.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/arc/arc_app_item.cc

diff --git a/chrome/browser/ui/app_list/arc/arc_app_item.cc b/chrome/browser/ui/app_list/arc/arc_app_item.cc

index 1fa0b9ed862015f7f2b925529ec34e3513d73dd3..66da1900247399e63b9654eeaf6c3c8032811f75 100644

--- a/chrome/browser/ui/app_list/arc/arc_app_item.cc

+++ b/chrome/browser/ui/app_list/arc/arc_app_item.cc

@@ -59,19 +59,14 @@

}

arc::ArcBridgeService* bridge_service = arc::ArcBridgeService::Get();

- if (!bridge_service) {

- VLOG(2) << "Request to launch app when bridge service is not ready: "

- << id() << ".";

- return;

- }

- arc::AppInstance* app_instance = bridge_service->app_instance();

- if (!app_instance) {

- VLOG(2) << "Request to launch app when bridge service is not ready: "

- << id() << ".";

+ if (!bridge_service ||

+ bridge_service->state() != arc::ArcBridgeService::State::READY) {

+ VLOG(2) << "Cannot launch app: " << app_info->package

+ << ". Bridge service is not ready.";

return;

}

- app_instance->LaunchApp(app_info->package, app_info->activity);

+ bridge_service->LaunchApp(app_info->package, app_info->activity);

}

void ArcAppItem::SetReady(bool ready) {