| Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
| ===================================================================
|
| --- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (revision 134496)
|
| +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (working copy)
|
| @@ -435,7 +435,7 @@
|
| ExtensionWebUI::GetFaviconForURL(profile, request, url);
|
| } else {
|
| history::FaviconData favicon;
|
| - favicon.image_data = scoped_refptr<RefCountedMemory>(
|
| + favicon.image_data = scoped_refptr<base::RefCountedMemory>(
|
| GetFaviconResourceBytes(url));
|
| favicon.known_icon = favicon.image_data.get() != NULL &&
|
| favicon.image_data->size() > 0;
|
| @@ -456,7 +456,7 @@
|
| ChromeWebUIControllerFactory::~ChromeWebUIControllerFactory() {
|
| }
|
|
|
| -RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
|
| +base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
|
| const GURL& page_url) const {
|
| // The bookmark manager is a chrome extension, so we have to check for it
|
| // before we check for extension scheme.
|
|
|