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/common/jstemplate_builder.h | |
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/common/jstemplate_builder.h')
-rw-r--r-- | chrome/common/jstemplate_builder.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/common/jstemplate_builder.h b/chrome/common/jstemplate_builder.h index e1861d2..ac8285f 100644 --- a/chrome/common/jstemplate_builder.h +++ b/chrome/common/jstemplate_builder.h @@ -16,29 +16,31 @@ #include <string> class DictionaryValue; +namespace base { class StringPiece; +} namespace jstemplate_builder { // A helper function that generates a string of HTML to be loaded. The // string includes the HTML and the javascript code necessary to generate the // full page with support for JsTemplates. -std::string GetTemplateHtml(const StringPiece& html_template, +std::string GetTemplateHtml(const base::StringPiece& html_template, const DictionaryValue* json, - const StringPiece& template_id); + const base::StringPiece& template_id); // A helper function that generates a string of HTML to be loaded. The // string includes the HTML and the javascript code necessary to generate the // full page with support for i18n Templates. -std::string GetI18nTemplateHtml(const StringPiece& html_template, +std::string GetI18nTemplateHtml(const base::StringPiece& html_template, const DictionaryValue* json); // A helper function that generates a string of HTML to be loaded. The // string includes the HTML and the javascript code necessary to generate the // full page with support for both i18n Templates and JsTemplates. -std::string GetTemplatesHtml(const StringPiece& html_template, +std::string GetTemplatesHtml(const base::StringPiece& html_template, const DictionaryValue* json, - const StringPiece& template_id); + const base::StringPiece& template_id); // The following functions build up the different parts that the above // templates use. @@ -52,7 +54,7 @@ void AppendJsTemplateSourceHtml(std::string* output); // Appends the code that processes the JsTemplate with the JSON. You should // call AppendJsTemplateSourceHtml and AppendJsonHtml before calling this. -void AppendJsTemplateProcessHtml(const StringPiece& template_id, +void AppendJsTemplateProcessHtml(const base::StringPiece& template_id, std::string* output); // Appends the source for i18n Templates in a script tag. |