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

Unified Diff: chrome/browser/chromeos/arc/process/arc_process_service.cc

Issue 2495913002: arc: Convert more Mojo types to STL (Closed)
Patch Set: Rebased to ToT Created 4 years, 1 month 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/chromeos/arc/process/arc_process_service.cc
diff --git a/chrome/browser/chromeos/arc/process/arc_process_service.cc b/chrome/browser/chromeos/arc/process/arc_process_service.cc
index 02dd8b0f58a9c7320ee7134fbe6cbfd9d2ee4eb0..c91e741d8ccfd142901713a65d932b4fe8f4deb4 100644
--- a/chrome/browser/chromeos/arc/process/arc_process_service.cc
+++ b/chrome/browser/chromeos/arc/process/arc_process_service.cc
@@ -141,7 +141,7 @@ void UpdateNspidToPidMap(
std::vector<ArcProcess> FilterProcessList(
const ArcProcessService::NSPidToPidMap& pid_map,
- mojo::Array<mojom::RunningAppProcessInfoPtr> processes) {
+ std::vector<mojom::RunningAppProcessInfoPtr> processes) {
std::vector<ArcProcess> ret_processes;
for (const auto& entry : processes) {
const auto it = pid_map.find(entry->pid);
@@ -157,8 +157,8 @@ std::vector<ArcProcess> FilterProcessList(
entry->is_focused, entry->last_activity_time);
// |entry->packages| is provided only when process.mojom's verion is >=4.
if (entry->packages) {
- for (const auto& package : entry->packages) {
- arc_process.packages().push_back(package.get());
+ for (const auto& package : *entry->packages) {
+ arc_process.packages().push_back(package);
}
}
ret_processes.push_back(std::move(arc_process));
@@ -168,7 +168,7 @@ std::vector<ArcProcess> FilterProcessList(
std::vector<ArcProcess> UpdateAndReturnProcessList(
scoped_refptr<ArcProcessService::NSPidToPidMap> nspid_map,
- mojo::Array<mojom::RunningAppProcessInfoPtr> processes) {
+ std::vector<mojom::RunningAppProcessInfoPtr> processes) {
ArcProcessService::NSPidToPidMap& pid_map = *nspid_map;
// Cleanup dead pids in the cache |pid_map|.
std::unordered_set<ProcessId> nspid_to_remove;
@@ -259,7 +259,7 @@ bool ArcProcessService::RequestAppProcessList(
void ArcProcessService::OnReceiveProcessList(
const RequestProcessListCallback& callback,
- mojo::Array<mojom::RunningAppProcessInfoPtr> instance_processes) {
+ std::vector<mojom::RunningAppProcessInfoPtr> instance_processes) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
base::PostTaskAndReplyWithResult(
« no previous file with comments | « chrome/browser/chromeos/arc/process/arc_process_service.h ('k') | chrome/browser/chromeos/arc/tts/arc_tts_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698