Index: chrome/browser/ui/webui/conflicts_ui.cc |
=================================================================== |
--- chrome/browser/ui/webui/conflicts_ui.cc (revision 134496) |
+++ chrome/browser/ui/webui/conflicts_ui.cc (working copy) |
@@ -171,9 +171,10 @@ |
} |
// static |
-RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
- return static_cast<RefCountedMemory*>(ResourceBundle::GetSharedInstance(). |
- LoadDataResourceBytes(IDR_CONFLICT_FAVICON)); |
+base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
+ return static_cast<base::RefCountedMemory*>( |
+ ResourceBundle::GetSharedInstance().LoadDataResourceBytes( |
+ IDR_CONFLICT_FAVICON)); |
} |
#endif |