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

Unified Diff: chrome/browser/privacy_blacklist/blocked_response.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 | « chrome/browser/extensions/user_script_master.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/privacy_blacklist/blocked_response.cc
diff --git a/chrome/browser/privacy_blacklist/blocked_response.cc b/chrome/browser/privacy_blacklist/blocked_response.cc
index aacb3447be11c64419b1c03911f1a2e6996d1d93..228886ac6c35e7d1f47bb289efe31ef8c560244b 100644
--- a/chrome/browser/privacy_blacklist/blocked_response.cc
+++ b/chrome/browser/privacy_blacklist/blocked_response.cc
@@ -40,7 +40,7 @@ std::string GetHTML(const Blacklist::Match* match) {
strings.SetString(L"name", entry->provider()->name());
strings.SetString(L"url", entry->provider()->url());
- const StringPiece html =
+ const base::StringPiece html =
ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_BLACKLIST_HTML);
return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
}
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698