Mash: Show app icons in shelf based on the Widget's app icon

mash/task_viewer/task_viewer.cc

Index: mash/task_viewer/task_viewer.cc
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
index 0e01a0059252f6f7d5f71d702cdd08be84ed4a6a..fb5cb1f2575ac92a308169418b3e99c195f9a299 100644
--- a/mash/task_viewer/task_viewer.cc
+++ b/mash/task_viewer/task_viewer.cc
@@ -19,6 +19,8 @@
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "ui/base/models/table_model.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/resources/grit/ui_resources.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/table/table_view.h"
@@ -87,6 +89,13 @@ class TaskViewerContents : public views::WidgetDelegateView,
     return base::ASCIIToUTF16("Tasks");
   }
 
+  gfx::ImageSkia GetWindowAppIcon() override {
+    // TODO(jamescook): Create a new .pak file for this app and make a custom
+    // icon, perhaps one that looks like the Chrome OS task viewer icon.
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    return *rb.GetImageSkiaNamed(IDR_NOTIFICATION_SETTINGS);
+  }
+
   // Overridden from views::View:
   void Layout() override {
     gfx::Rect bounds = GetLocalBounds();