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 /app/resource_bundle_win.cc | |
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 'app/resource_bundle_win.cc')
-rw-r--r-- | app/resource_bundle_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index dcb669e..3526481 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. |