Refactor extension app icon.

chrome/browser/extensions/chrome_app_icon_loader.h

Index: chrome/browser/extensions/chrome_app_icon_loader.h
diff --git a/chrome/browser/extensions/chrome_app_icon_loader.h b/chrome/browser/extensions/chrome_app_icon_loader.h
new file mode 100644
index 0000000000000000000000000000000000000000..0332d51a2629b5af282d80ae5db8b98c24e07fc4
--- /dev/null
+++ b/chrome/browser/extensions/chrome_app_icon_loader.h
@@ -0,0 +1,50 @@
+// Copyright 2016 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_EXTENSIONS_CHROME_APP_ICON_LOADER_H_
+#define CHROME_BROWSER_EXTENSIONS_CHROME_APP_ICON_LOADER_H_
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "base/macros.h"
+#include "chrome/browser/extensions/chrome_app_icon_delegate.h"
+#include "chrome/browser/ui/app_icon_loader.h"
+
+class Profile;
+
+namespace extensions {
+
+// Implementation of AppIconLoader that interacts with the ExtensionService and
+// ImageLoader to load images.

[msw, 2017/05/03 01:17:39]

What is ImageLoader? I don't see that referenced here or in the cc file.

[khmel, 2017/05/03 02:15:22]

Good catch, left from previous impl.

+class ChromeAppIconLoader : public AppIconLoader, public ChromeAppIconDelegate {
+ public:
+  ChromeAppIconLoader(Profile* profile,
+                      int icon_size,

[msw, 2017/05/03 01:17:39]

nit: icon_size_in_dips?

[khmel, 2017/05/03 02:15:22]

Done.

+                      AppIconLoaderDelegate* delegate);
+  ~ChromeAppIconLoader() override;
+
+  // AppIconLoader overrides:
+  bool CanLoadImageForApp(const std::string& id) override;
+  void FetchImage(const std::string& id) override;
+  void ClearImage(const std::string& id) override;
+  void UpdateImage(const std::string& id) override;
+
+ private:
+  using ExtensionIDToImageMap =

[msw, 2017/05/03 01:17:39]

nit: s/Image/ChromeAppIcon/? Let's avoid mixing the names where possible.

[khmel, 2017/05/03 02:15:22]

Done

+      std::map<std::string, std::unique_ptr<ChromeAppIcon>>;
+
+  // ChromeAppIconDelegate:
+  void OnIconUpdated(ChromeAppIcon* icon) override;
+
+  // Maps from extension id to IconImage pointer.

[msw, 2017/05/03 01:17:39]

nit: s/IconImage pointer/ChromeAppIcon/?

[khmel, 2017/05/03 02:15:22]

Done.

+  ExtensionIDToImageMap map_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromeAppIconLoader);
+};
+
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_CHROME_APP_ICON_LOADER_H_