Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7341)

Unified Diff: chrome/browser/task_manager/providers/arc/arc_process_task.cc

Issue 2347293002: arc: Add InstanceHelper::GetInstanceForMethod() (Closed)
Patch Set: No more DCHECK Created 4 years, 3 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
Index: chrome/browser/task_manager/providers/arc/arc_process_task.cc
diff --git a/chrome/browser/task_manager/providers/arc/arc_process_task.cc b/chrome/browser/task_manager/providers/arc/arc_process_task.cc
index 4db749c0830af577cc5f2141033fd11a061f6acf..3929c3a8f714f95bf0819cc2e80cef854a8b7152 100644
--- a/chrome/browser/task_manager/providers/arc/arc_process_task.cc
+++ b/chrome/browser/task_manager/providers/arc/arc_process_task.cc
@@ -20,6 +20,8 @@ namespace task_manager {
namespace {
+constexpr uint32_t kKillProcessMinInstanceVersion = 1;
+
base::string16 MakeTitle(const std::string& process_name,
arc::mojom::ProcessState process_state) {
int name_template = IDS_TASK_MANAGER_ARC_PREFIX;
@@ -126,18 +128,12 @@ bool ArcProcessTask::IsKillable() {
}
void ArcProcessTask::Kill() {
- arc::mojom::ProcessInstance* arc_process_instance =
- arc::ArcBridgeService::Get()->process()->instance();
- if (!arc_process_instance) {
- LOG(ERROR) << "ARC process instance is not ready.";
- return;
- }
- if (arc::ArcBridgeService::Get()->process()->version() < 1) {
- LOG(ERROR) << "ARC KillProcess IPC is unavailable.";
+ auto* process_instance =
+ arc::ArcBridgeService::Get()->process()->GetInstanceForMethod(
+ "KillProcess", kKillProcessMinInstanceVersion);
+ if (!process_instance)
return;
- }
- arc_process_instance->KillProcess(nspid_,
- "Killed manually from Task Manager");
+ process_instance->KillProcess(nspid_, "Killed manually from Task Manager");
}
void ArcProcessTask::OnInstanceReady() {
« no previous file with comments | « chrome/browser/chromeos/arc/arc_wallpaper_service.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698