Index: chrome/browser/extensions/extension_service.cc |
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
index 485eb6be7af64b6c48c0f2856f161158fd63c07e..2e4e9e9d6250d2d82d56b1dd38ccf3aa7534a58c 100644 |
--- a/chrome/browser/extensions/extension_service.cc |
+++ b/chrome/browser/extensions/extension_service.cc |
@@ -2255,14 +2255,14 @@ bool ExtensionService::ExtensionBindingsAllowed(const GURL& url) { |
extension->location() == Extension::COMPONENT); |
} |
-const SkBitmap& ExtensionService::GetOmniboxIcon( |
+gfx::Image ExtensionService::GetOmniboxIcon( |
const std::string& extension_id) { |
- return omnibox_icon_manager_.GetIcon(extension_id); |
+ return gfx::Image(omnibox_icon_manager_.GetIcon(extension_id)); |
sky
2012/08/20 15:15:51
Can GetIcon return a gfx::Image?
pkotwicz
2012/08/20 15:52:48
That's a good idea. However doing this is not supe
|
} |
-const SkBitmap& ExtensionService::GetOmniboxPopupIcon( |
+gfx::Image ExtensionService::GetOmniboxPopupIcon( |
const std::string& extension_id) { |
- return omnibox_popup_icon_manager_.GetIcon(extension_id); |
+ return gfx::Image(omnibox_popup_icon_manager_.GetIcon(extension_id)); |
} |
bool ExtensionService::OnExternalExtensionFileFound( |