Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
index db332974b3d5eb58d2aa0bbb9c64c336b0fabf95..9a64aa403e77809d5a99046336844c187297fd8d 100644 |
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc |
@@ -622,7 +622,6 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( |
if (page_url.host() == chrome::kChromeUIComponentsHost) |
return ComponentsUI::GetFaviconResourceBytes(scale_factor); |
- return NULL; |
#if defined(OS_WIN) |
if (page_url.host() == chrome::kChromeUIConflictsHost) |
@@ -667,4 +666,6 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes( |
return PluginsUI::GetFaviconResourceBytes(scale_factor); |
#endif |
+ |
+ return NULL; |
} |