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/dom_ui/dom_ui_theme_source.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/dom_ui/dom_ui_theme_source.cc')
| -rw-r--r-- | chrome/browser/dom_ui/dom_ui_theme_source.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.cc b/chrome/browser/dom_ui/dom_ui_theme_source.cc index f2ebbf5..bcdc813 100644 --- a/chrome/browser/dom_ui/dom_ui_theme_source.cc +++ b/chrome/browser/dom_ui/dom_ui_theme_source.cc @@ -181,7 +181,7 @@ void DOMUIThemeSource::InitNewTabCSS() { subst2.push_back(SkColorToRGBAString(color_section_link_underline)); // $$7 // Get our template. - static const StringPiece new_tab_theme_css( + static const base::StringPiece new_tab_theme_css( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_NEW_TAB_THEME_CSS)); @@ -215,7 +215,7 @@ void DOMUIThemeSource::InitNewIncognitoTabCSS() { subst.push_back(UTF8ToUTF16(GetNewTabBackgroundTilingCSS())); // $5 // Get our template. - static const StringPiece new_tab_theme_css( + static const base::StringPiece new_tab_theme_css( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_NEW_INCOGNITO_TAB_THEME_CSS)); |