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

mash/task_viewer/task_viewer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/task_viewer/task_viewer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/shell/public/cpp/connection.h"
 #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"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace mash {
 namespace task_viewer {
@@ skipping 48 matching lines @@
   };
 
 
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
     return base::ASCIIToUTF16("Tasks");
   }
 
+  gfx::ImageSkia GetWindowAppIcon() override {
+    // TODO(jamescook): Create a new .pak file for this app and use a custom

[msw, 2016/03/24 17:40:54]

Hmm, if this relies on chrome's image resources, we might want to pick another
image, or use a more strongly worded comment. Building mash:all shouldn't (and
hopefully still doesn't) build chrome's resource pak. Mash does rely on
ash_resources (see sysui_application's InitializeResourceBundle). Maybe this
could do the same with an icon in ash/resources/ash_resources.grd (for now).

[James Cook, 2016/03/25 15:39:28]

This icon isn't from Chrome or Ash. For better or worse it lives in
ui/resources, which is why I picked it. task_viewer only uses
views_mus_resources.pak, which includes ui_resource.pak. Updated the comment to
be more clear about what I meant by a new icon.

+    // icon, perhaps similar to the Chrome OS task viewer.
+    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    return *rb.GetImageSkiaNamed(IDR_NOTIFICATION_SETTINGS);
+  }
+
   // Overridden from views::View:
   void Layout() override {
     gfx::Rect bounds = GetLocalBounds();
     bounds.Inset(10, 10);
 
     gfx::Size ps = kill_button_->GetPreferredSize();
     bounds.set_height(bounds.height() - ps.height() - 10);
 
     kill_button_->SetBounds(bounds.width() - ps.width(),
                             bounds.bottom() + 10,
@@ skipping 178 matching lines @@
 
   TaskViewerContents* task_viewer = new TaskViewerContents(
       std::move(request), std::move(catalog));
   views::Widget* window = views::Widget::CreateWindowWithBounds(
       task_viewer, gfx::Rect(10, 10, 500, 500));
   window->Show();
 }
 
 }  // namespace task_viewer
 }  // namespace main