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

Unified Diff: app/resource_bundle_win.cc

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 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 | « app/resource_bundle_mac.mm ('k') | base/data_pack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/resource_bundle_win.cc
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc
index dcb669e9b0a5f2cbd632bca33fef5e544c2aaceb..35264816f9afa2a9770b180019fe80dc3402c6a7 100644
--- a/app/resource_bundle_win.cc
+++ b/app/resource_bundle_win.cc
@@ -105,22 +105,22 @@ HICON ResourceBundle::LoadThemeIcon(int icon_id) {
return ::LoadIcon(theme_data_, MAKEINTRESOURCE(icon_id));
}
-StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
+base::StringPiece ResourceBundle::GetRawDataResource(int resource_id) {
void* data_ptr;
size_t data_size;
if (base::GetDataResourceFromModule(_AtlBaseModule.GetModuleInstance(),
resource_id,
&data_ptr,
&data_size)) {
- return StringPiece(static_cast<const char*>(data_ptr), data_size);
+ return base::StringPiece(static_cast<const char*>(data_ptr), data_size);
} else if (locale_resources_data_ &&
base::GetDataResourceFromModule(locale_resources_data_,
resource_id,
&data_ptr,
&data_size)) {
- return StringPiece(static_cast<const char*>(data_ptr), data_size);
+ return base::StringPiece(static_cast<const char*>(data_ptr), data_size);
}
- return StringPiece();
+ return base::StringPiece();
}
// Loads and returns a cursor from the current module.
« no previous file with comments | « app/resource_bundle_mac.mm ('k') | base/data_pack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698