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

Side by Side Diff: chrome/browser/task_management/providers/arc/arc_process_task.cc

Issue 1584473004: Migrate ProcessesEventRouter to the new task manager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nit. Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_management/providers/arc/arc_process_task.h" 5 #include "chrome/browser/task_management/providers/arc/arc_process_task.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/arc/arc_bridge_service.h" 10 #include "components/arc/arc_bridge_service.h"
11 #include "content/public/common/child_process_host.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 13
13 namespace task_management { 14 namespace task_management {
14 15
15 namespace { 16 namespace {
16 17
17 base::string16 MakeTitle(const std::string& process_name) { 18 base::string16 MakeTitle(const std::string& process_name) {
18 base::string16 title = 19 base::string16 title =
19 l10n_util::GetStringFUTF16( 20 l10n_util::GetStringFUTF16(
20 IDS_TASK_MANAGER_ARC_PREFIX, base::UTF8ToUTF16(process_name)); 21 IDS_TASK_MANAGER_ARC_PREFIX, base::UTF8ToUTF16(process_name));
(...skipping 14 matching lines...) Expand all
35 36
36 ArcProcessTask::~ArcProcessTask() { 37 ArcProcessTask::~ArcProcessTask() {
37 } 38 }
38 39
39 Task::Type ArcProcessTask::GetType() const { 40 Task::Type ArcProcessTask::GetType() const {
40 return Task::ARC; 41 return Task::ARC;
41 } 42 }
42 43
43 int ArcProcessTask::GetChildProcessUniqueID() const { 44 int ArcProcessTask::GetChildProcessUniqueID() const {
44 // ARC process is not a child process of the browser. 45 // ARC process is not a child process of the browser.
45 return 0; 46 return content::ChildProcessHost::kInvalidUniqueID;
46 } 47 }
47 48
48 void ArcProcessTask::Kill() { 49 void ArcProcessTask::Kill() {
49 arc::ProcessInstance* arc_process_instance = 50 arc::ProcessInstance* arc_process_instance =
50 arc::ArcBridgeService::Get()->process_instance(); 51 arc::ArcBridgeService::Get()->process_instance();
51 if (!arc_process_instance) { 52 if (!arc_process_instance) {
52 LOG(ERROR) << "ARC process instance is not ready."; 53 LOG(ERROR) << "ARC process instance is not ready.";
53 return; 54 return;
54 } 55 }
55 if (arc::ArcBridgeService::Get()->process_version() < 1) { 56 if (arc::ArcBridgeService::Get()->process_version() < 1) {
56 LOG(ERROR) << "ARC KillProcess IPC is unavailable."; 57 LOG(ERROR) << "ARC KillProcess IPC is unavailable.";
57 return; 58 return;
58 } 59 }
59 arc_process_instance->KillProcess( 60 arc_process_instance->KillProcess(
60 nspid_, "Killed manually from Task Manager"); 61 nspid_, "Killed manually from Task Manager");
61 } 62 }
62 63
63 } // namespace task_management 64 } // namespace task_management
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/task_management/providers/task.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698