Add ARC app icons to the Task Manager UI

chrome/browser/task_management/providers/arc/arc_process_task.h

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..8d4325d571e633e018362bfc81bc4dcd39c1b47a 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,27 @@
 #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"
+#include "ui/gfx/image/image.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>& activities);

[Luis Héctor Chávez, 2016/05/31 22:10:53]

packages?

[Yusuke Sato, 2016/05/31 23:11:52]

Done.

   ~ArcProcessTask() override;
 
   // task_management::Task:
@@ -35,9 +40,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_;
+  gfx::Image icon_;
+
+  // 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_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcProcessTask);
 };