Moves extension_icon_image and image_loader to extensions/browser

chrome/browser/extensions/chrome_component_extension_resource_manager.cc

Index: chrome/browser/extensions/chrome_component_extension_resource_manager.cc
diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b531556895359a552457be16f51e71f30aaa8424
--- /dev/null
+++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc
@@ -0,0 +1,101 @@
+// Copyright 2014 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/extensions/chrome_component_extension_resource_manager.h"
+
+#include "base/logging.h"
+#include "base/path_service.h"
+#include "chrome/common/chrome_paths.h"
+#include "grit/chrome_unscaled_resources.h"
+#include "grit/component_extension_resources_map.h"
+#include "grit/theme_resources.h"
+
+#if defined(OS_CHROMEOS)
+#include "ui/file_manager/file_manager_resource_util.h"
+#endif
+
+#if defined(USE_AURA)
+#include "ui/keyboard/keyboard_util.h"
+#endif
+
+namespace extensions {
+
+ChromeComponentExtensionResourceManager::
+ChromeComponentExtensionResourceManager() {
+  static const GritResourceMap kExtraComponentExtensionResources[] = {
+    {"web_store/webstore_icon_128.png", IDR_WEBSTORE_ICON},
+    {"web_store/webstore_icon_16.png", IDR_WEBSTORE_ICON_16},
+    {"chrome_app/product_logo_128.png", IDR_PRODUCT_LOGO_128},
+    {"chrome_app/product_logo_16.png", IDR_PRODUCT_LOGO_16},
+#if defined(ENABLE_SETTINGS_APP)
+    {"settings_app/settings_app_icon_128.png", IDR_SETTINGS_APP_ICON_128},
+    {"settings_app/settings_app_icon_16.png", IDR_SETTINGS_APP_ICON_16},
+    {"settings_app/settings_app_icon_32.png", IDR_SETTINGS_APP_ICON_32},
+    {"settings_app/settings_app_icon_48.png", IDR_SETTINGS_APP_ICON_48},
+#endif
+  };
+
+  AddComponentResourceEntries(
+      kComponentExtensionResources,
+      kComponentExtensionResourcesSize);
+  AddComponentResourceEntries(
+      kExtraComponentExtensionResources,
+      arraysize(kExtraComponentExtensionResources));
+#if defined(OS_CHROMEOS)
+  size_t file_manager_resource_size;
+  const GritResourceMap* file_manager_resources =
+      file_manager::GetFileManagerResources(&file_manager_resource_size);
+  AddComponentResourceEntries(
+      file_manager_resources,
+      file_manager_resource_size);
+
+  size_t keyboard_resource_size;
+  const GritResourceMap* keyboard_resources =
+      keyboard::GetKeyboardExtensionResources(&keyboard_resource_size);
+  AddComponentResourceEntries(
+      keyboard_resources,
+      keyboard_resource_size);
+#endif
+}
+
+ChromeComponentExtensionResourceManager::
+~ChromeComponentExtensionResourceManager() {}
+
+bool ChromeComponentExtensionResourceManager::IsComponentExtensionResource(
+    const base::FilePath& extension_path,
+    const base::FilePath& resource_path,
+    int* resource_id) {
+  base::FilePath directory_path = extension_path;
+  base::FilePath resources_dir;
+  base::FilePath relative_path;
+  if (!PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
+      !resources_dir.AppendRelativePath(directory_path, &relative_path)) {
+    return false;
+  }
+  relative_path = relative_path.Append(resource_path);
+  relative_path = relative_path.NormalizePathSeparators();
+
+  std::map<base::FilePath, int>::const_iterator entry =
+      path_to_resource_id_.find(relative_path);
+  if (entry != path_to_resource_id_.end())
+    *resource_id = entry->second;
+
+  return entry != path_to_resource_id_.end();
+}
+
+void ChromeComponentExtensionResourceManager::AddComponentResourceEntries(

[James Cook, 2014/06/17 22:01:04]

I think there was a comment for this function in the old code.

[Jun Mukai, 2014/06/17 23:53:02]

file removed -- also added (copied) the old comment to the new place

+    const GritResourceMap* entries,
+    size_t size) {
+  for (size_t i = 0; i < size; ++i) {
+    base::FilePath resource_path = base::FilePath().AppendASCII(
+        entries[i].name);
+    resource_path = resource_path.NormalizePathSeparators();
+
+    DCHECK(path_to_resource_id_.find(resource_path) ==
+        path_to_resource_id_.end());
+    path_to_resource_id_[resource_path] = entries[i].value;
+  }
+}
+
+}  // namespace extensions