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/browser_main.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 'chrome/browser/browser_main.cc')
-rw-r--r-- | chrome/browser/browser_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c2450f7..c15274b 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -192,9 +192,9 @@ base::LazyInstance<LazyDirectoryListerCacher> lazy_dir_lister( base::LINKER_INITIALIZED); // This is called indirectly by the network layer to access resources. -StringPiece NetResourceProvider(int key) { +base::StringPiece NetResourceProvider(int key) { if (IDR_DIR_HEADER_HTML == key) - return StringPiece(lazy_dir_lister.Pointer()->html_data); + return base::StringPiece(lazy_dir_lister.Pointer()->html_data); return ResourceBundle::GetSharedInstance().GetRawDataResource(key); } |