diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-10 21:08:39 +0000 |
| commit | 8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee (patch) | |
| tree | 5c07a9d5091a56c6d5a1a2b98ec10d19ae3c20e9 /chrome/browser/privacy_blacklist | |
| parent | f8dce00e633d5ffde45e008fb8f51d5a76942f6b (diff) | |
| download | chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.zip chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.gz chromium_src-8a16266e66a38bc1bfc6b00893c2a7c8cf8c55ee.tar.bz2 | |
Move StringPiece into the base namespace. It is colliding
with the StringPiece class in icu4.2, which is a problem
when trying to use the system version of icu.
Review URL: http://codereview.chromium.org/193072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25920 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/privacy_blacklist')
| -rw-r--r-- | chrome/browser/privacy_blacklist/blocked_response.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/privacy_blacklist/blocked_response.cc b/chrome/browser/privacy_blacklist/blocked_response.cc index aacb344..228886a 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); } |