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

Unified Diff: chrome/browser/task_management/providers/arc/arc_process_task.h

Issue 2023643002: Add ARC app icons to the Task Manager UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert back to the original test code Created 4 years, 7 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_management/providers/arc/arc_process_task.h
diff --git a/chrome/browser/task_management/providers/arc/arc_process_task.h b/chrome/browser/task_management/providers/arc/arc_process_task.h
index 8acc525e9e7c0a2255d161a0bf4f96a343a5b63a..17d8437e055cc3bfe5d3545e478d78f2ed32ffc0 100644
--- a/chrome/browser/task_management/providers/arc/arc_process_task.h
+++ b/chrome/browser/task_management/providers/arc/arc_process_task.h
@@ -5,22 +5,26 @@
#ifndef CHROME_BROWSER_TASK_MANAGEMENT_PROVIDERS_ARC_ARC_PROCESS_TASK_H_
#define CHROME_BROWSER_TASK_MANAGEMENT_PROVIDERS_ARC_ARC_PROCESS_TASK_H_
+#include <memory>
#include <string>
+#include <vector>
#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
#include "chrome/browser/task_management/providers/task.h"
#include "components/arc/common/process.mojom.h"
+#include "components/arc/intent_helper/activity_icon_loader.h"
namespace task_management {
// Defines a task that represents an ARC process.
class ArcProcessTask : public Task {
public:
- ArcProcessTask(
- base::ProcessId pid,
- base::ProcessId nspid,
- const std::string& process_name,
- arc::mojom::ProcessState process_state);
+ ArcProcessTask(base::ProcessId pid,
+ base::ProcessId nspid,
+ const std::string& process_name,
+ arc::mojom::ProcessState process_state,
+ const std::vector<std::string>& packages);
~ArcProcessTask() override;
// task_management::Task:
@@ -35,10 +39,17 @@ class ArcProcessTask : public Task {
const std::string& process_name() const { return process_name_; }
private:
+ void OnIconLoaded(
+ std::unique_ptr<arc::ActivityIconLoader::ActivityToIconsMap> icons);
+
const base::ProcessId nspid_;
const std::string process_name_;
arc::mojom::ProcessState process_state_;
+ // Note: This should remain the last member so it'll be destroyed and
+ // invalidate the weak pointers before any other members are destroyed.
+ base::WeakPtrFactory<ArcProcessTask> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(ArcProcessTask);
};

Powered by Google App Engine
This is Rietveld 408576698