Show CWS and FileManager icons in pinned apps

chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/ash/launcher/chrome_launcher_delegate.h"
 
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_app_icon_loader.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
+#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
+#include "grit/component_extension_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // See description in PersistPinnedState().
 const char kAppIDPath[] = "id";
 const char kAppTypePanel[] = "panel";
@@ skipping 305 matching lines @@
        i != id_to_item_map_.end(); ++i) {
     if (i->second.app_id != id)
       continue;
     // Panel items may share the same app_id as the app that created them,
     // but they set their icon image in LauncherUpdater::UpdateLauncher(),
     // so do not set panel images here.
     if (i->second.app_type == APP_TYPE_EXTENSION_PANEL)
       continue;
     int index = model_->ItemIndexByID(i->first);
     ash::LauncherItem item = model_->items()[index];
+    // TODO(dpolukhin): remove this ugly hack and start using
+    // ExtensionIconSource that knows how to work with component extensions.

[sky, 2012/04/05 16:30:50]

Why doesn't ImageLoadingTracker work for this? If we need to hack these special
cases, shouldn't it be done in ImageLoadingTracker?

[Dmitry Polukhin, 2012/04/05 17:11:08]

Good suggestion! I'll move similar code from ExtensionIconSource and here to 
ImageLoadingTracker. It might be even be good enough long term solution and
should be just a bit more complex than this hack.

+    if (id == extension_misc::kWebStoreAppId) {
+      item.image =
+        *ExtensionIconSource::LoadImageByResourceId(IDR_WEBSTORE_ICON_32);
+    } else if (id == "hhaomjibdihmijegdhdafkllkbggdgoj") {
+      item.image =
+        *ExtensionIconSource::LoadImageByResourceId(IDR_FILE_MANAGER_ICON_128);
+    } else if (image) {
       item.image = image ? *image : Extension::GetDefaultIcon(true);
+    }
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }
 
 bool ChromeLauncherDelegate::IsAppPinned(const std::string& app_id) {
   for (IDToItemMap::const_iterator i = id_to_item_map_.begin();
        i != id_to_item_map_.end(); ++i) {
     if (IsPinned(i->first) && i->second.app_id == app_id)
       return true;
@@ skipping 212 matching lines @@
   while (!pending_pinned_apps_.empty()) {
     const Item& item = pending_pinned_apps_.front();
 
     if (!app_icon_loader_->IsValidID(item.app_id))
       return;
 
     PinAppWithID(item.app_id, item.app_type);
     pending_pinned_apps_.pop();
   }
 }