3 files changed, 16 insertions, 0 deletions
diff --git a/ui/app_list/app_list_view_delegate.h b/ui/app_list/app_list_view_delegate.h
index 5143544..c289151 100644
--- a/ui/app_list/app_list_view_delegate.h
+++ b/ui/app_list/app_list_view_delegate.h
@@ -7,6 +7,10 @@
 
 #include "ui/app_list/app_list_export.h"
 
+namespace gfx {
+class ImageSkia;
+}
+
 namespace app_list {
 
 class AppListItemModel;
@@ -57,6 +61,9 @@ class APP_LIST_EXPORT AppListViewDelegate {
 
   // Invoked when the app list's activated state changes.
   virtual void ViewActivationChanged(bool active) = 0;
+
+  // Returns the icon to be displayed in the window and taskbar.
+  virtual gfx::ImageSkia GetWindowIcon() = 0;
 };
 
 }  // namespace app_list
diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc
index f946b4c..6b099fd 100644
--- a/ui/app_list/views/app_list_view.cc
+++ b/ui/app_list/views/app_list_view.cc
@@ -14,6 +14,7 @@
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/signin_view.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
@@ -140,6 +141,13 @@ views::View* AppListView::GetInitiallyFocusedView() {
   return app_list_main_view_->search_box_view()->search_box();
 }
 
+gfx::ImageSkia AppListView::GetWindowIcon() {
+  if (delegate_.get())
+    return delegate_->GetWindowIcon();
+
+  return gfx::ImageSkia();
+}
+
 bool AppListView::WidgetHasHitTestMask() const {
   return true;
 }
diff --git a/ui/app_list/views/app_list_view.h b/ui/app_list/views/app_list_view.h
index 45ac04f..163ec7e 100644
--- a/ui/app_list/views/app_list_view.h
+++ b/ui/app_list/views/app_list_view.h
@@ -58,6 +58,7 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
  private:
   // Overridden from views::WidgetDelegateView:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
+  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
   virtual bool WidgetHasHitTestMask() const OVERRIDE;
   virtual void GetWidgetHitTestMask(gfx::Path* mask) const OVERRIDE;