Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3796)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/webui/conflicts_ui.cc

Issue 10165020: Move RefCountedStaticMemory to base namespace (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/chromeos/system_info_ui.cc ('k') | chrome/browser/ui/webui/devtools_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/conflicts_ui.cc
===================================================================
--- chrome/browser/ui/webui/conflicts_ui.cc (revision 133676)
+++ chrome/browser/ui/webui/conflicts_ui.cc (working copy)
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/memory/ref_counted_memory.h"
#include "base/string_number_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
@@ -172,8 +173,8 @@
// static
RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() {
- return ResourceBundle::GetSharedInstance().
- LoadDataResourceBytes(IDR_CONFLICT_FAVICON);
+ return static_cast<RefCountedMemory*>(ResourceBundle::GetSharedInstance().
+ LoadDataResourceBytes(IDR_CONFLICT_FAVICON));
}
#endif
« no previous file with comments | « chrome/browser/ui/webui/chromeos/system_info_ui.cc ('k') | chrome/browser/ui/webui/devtools_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698