Support custom icon in search result.

chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h

Index: chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h
diff --git a/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h b/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h
new file mode 100644
index 0000000000000000000000000000000000000000..ee4535c74787c9c6d9ffb9696ce9337189ea1b9d
--- /dev/null
+++ b/chrome/browser/ui/app_list/search/launcher_search/extension_badged_icon_image.h
@@ -0,0 +1,97 @@
+// 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.
+
+#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_H_
+#define CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_H_
+
+#include "base/memory/ref_counted.h"
+#include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h"
+#include "chrome/browser/profiles/profile.h"
+#include "extensions/common/extension.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "url/gurl.h"
+
+namespace app_list {
+
+// Provides an icon image which is badged with extension icon. If custom icon
+// image is not specified, extension icon will be used.
+class ExtensionBadgedIconImage {
+ public:
+  class Observer {
+   public:
+    // Called when icon image is changed. To obtain the new image, call
+    // GetIconImage method.
+    virtual void OnIconImageChanged(ExtensionBadgedIconImage* image) = 0;
+  };
+
+  // If |custom_icon_url| is empty, uses the extension icon.
+  ExtensionBadgedIconImage(
+      const GURL& custom_icon_url,
+      Profile* profile,
+      const extensions::Extension* extension,
+      const int icon_dimension,
+      scoped_refptr<chromeos::launcher_search_provider::ErrorReporter>
+          error_reporter);
+  virtual ~ExtensionBadgedIconImage();
+
+  // Load resources caller must call this function to generate icon image.
+  void LoadResources();
+
+  // Adds |observer| to listen icon image changed event. To get fresh icon
+  // image, you need to add observer before you call GetIconImage.
+  void AddObserver(Observer* observer);
+
+  // Removes |observer|.
+  void RemoveObserver(Observer* observer);
+
+  // Returns badged icon image
+  const gfx::ImageSkia& GetIconImage() const;
+
+ protected:
+  // Loads |extension| icon and returns it as sync if possible. When it loads

[Matt Giuca, 2015/05/05 04:25:30]

What does it return if it decides to use async? A null ImageSkia?

(I can't see any logic for this in
ExtensionBadgedIconImageImpl::LoadExtensionIcon; it always seems to be sync.)

[yawano, 2015/05/07 06:24:55]

In the constructor of extension:IconImage, it loads default icon if it's
provided. In IconImage, it uses ImageLoader to load extension resource async,
and notify observers when it completed (ExtensionBadgedIconImageImpl is one of
the observers).

https://code.google.com/p/chromium/codesearch#chromium/src/extensions/browser...
Note: Source class is defined in the above of same file.

+  // icon as async, it calls OnExtensionIconImageChanged.
+  virtual const gfx::ImageSkia& LoadExtensionIcon() = 0;
+
+  // Loads |icon_url_| as async. When it loads an image, OnCustomIconLoaded will
+  // be called with an image. When it fails to load an image, OnCustomIconLoaded
+  // will be called with an empty image.
+  virtual void LoadExtensionIconResource() = 0;

[Matt Giuca, 2015/05/05 04:25:30]

So LoadExtensionIcon loads the extension's icon, whereas
LoadExtensionIconResource loads an arbitrary icon resource from an extension
URL, correct?

The naming is very confusing (they seem so similar, it seems at first glance
that they are both loading an extension icon in different ways).

Can we rename this to LoadIconResourceFromExtension?

[yawano, 2015/05/07 06:24:55]

Done.

+
+  // Called when extension icon image is changed.
+  void OnExtensionIconChanged(const gfx::ImageSkia& image);
+
+  // Called when custom icon image is loaded.
+  void OnCustomIconLoaded(const gfx::ImageSkia& image);
+
+  Profile* profile_;
+  const extensions::Extension* extension_;
+  const GURL icon_url_;
+  const gfx::Size icon_size_;
+
+ private:
+  // Updates icon image.
+  void Update();
+
+  // Sets new icon image, and notify to observers.
+  void SetIconImage(const gfx::ImageSkia& image);
+
+  // Returns truncated icon url. Since max_size includes trailing ..., it should
+  // be larger than 3.
+  std::string GetTruncatedIconUrl(const uint32 max_size);
+
+  gfx::ImageSkia extension_icon_image_;
+  gfx::ImageSkia custom_icon_image_;
+  gfx::ImageSkia badged_icon_image_;
+
+  scoped_refptr<chromeos::launcher_search_provider::ErrorReporter>
+      error_reporter_;
+  std::set<Observer*> observers_;
+
+  DISALLOW_COPY_AND_ASSIGN(ExtensionBadgedIconImage);
+};
+
+}  // namespace app_list
+
+#endif  // CHROME_BROWSER_UI_APP_LIST_SEARCH_LAUNCHER_SEARCH_EXTENSION_BADGED_ICON_IMAGE_H_