| Index: chrome/browser/dom_ui/app_launcher_handler.cc
|
| diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
|
| index 6b395f24ce29adf2ca615acfb18a2fd0d26d0b1c..2d3dee697d77c44afa201989863306e306a62c04 100644
|
| --- a/chrome/browser/dom_ui/app_launcher_handler.cc
|
| +++ b/chrome/browser/dom_ui/app_launcher_handler.cc
|
| @@ -41,17 +41,11 @@ bool ExtractInt(const ListValue* list, size_t index, int* out_int) {
|
|
|
| std::string GetIconURL(Extension* extension, Extension::Icons icon,
|
| const std::string& default_val) {
|
| - ExtensionResource resource = extension->GetIconPath(icon);
|
| - if (resource.empty())
|
| + GURL url = extension->GetIconURL(icon);
|
| + if (!url.is_empty())
|
| + return url.spec();
|
| + else
|
| return default_val;
|
| -
|
| -#if defined(OS_POSIX)
|
| - std::string path = resource.relative_path().value();
|
| -#elif defined(OS_WIN)
|
| - std::string path = WideToUTF8(resource.relative_path().value());
|
| -#endif // OS_WIN
|
| -
|
| - return extension->GetResourceURL(path).spec();
|
| }
|
|
|
| } // namespace
|
|
|