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_about_handler.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_about_handler.cc')
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index c7805eb..047ca97 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -247,7 +247,7 @@ std::string AboutPlugins() { localized_strings.SetString(L"enabled_no", l10n_util::GetString(IDS_ABOUT_PLUGINS_ENABLED_NO)); - static const StringPiece plugins_html( + static const base::StringPiece plugins_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_ABOUT_PLUGINS_HTML)); @@ -348,7 +348,7 @@ std::string AboutStats() { } // Get about_stats.html - static const StringPiece stats_html( + static const base::StringPiece stats_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_ABOUT_STATS_HTML)); @@ -514,7 +514,7 @@ std::string AboutSync() { full_status.max_consecutive_errors); } - static const StringPiece sync_html( + static const base::StringPiece sync_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_ABOUT_SYNC_HTML)); @@ -720,7 +720,7 @@ void AboutMemoryHandler::OnDetailsAvailable() { } // Get about_memory.html - static const StringPiece memory_html( + static const base::StringPiece memory_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_ABOUT_MEMORY_HTML)); |