| Index: ui/base/webui/jstemplate_builder.h
|
| diff --git a/ui/base/webui/jstemplate_builder.h b/ui/base/webui/jstemplate_builder.h
|
| index 66b265a0476d3c8c136c894ddf336eb5248f1ff0..1ad15c3639213db22b875215a7602d708e5c17e2 100644
|
| --- a/ui/base/webui/jstemplate_builder.h
|
| +++ b/ui/base/webui/jstemplate_builder.h
|
| @@ -16,7 +16,7 @@
|
| #include <string>
|
|
|
| #include "base/strings/string_piece.h"
|
| -#include "ui/base/ui_export.h"
|
| +#include "ui/base/ui_base_export.h"
|
|
|
| namespace base {
|
| class DictionaryValue;
|
| @@ -27,7 +27,7 @@ namespace webui {
|
| // While an object of this class is in scope, the template builder will output
|
| // version 2 html. Version 2 uses load_time_data.js and i18n_template2.js, and
|
| // should soon become the default.
|
| -class UI_EXPORT UseVersion2 {
|
| +class UI_BASE_EXPORT UseVersion2 {
|
| public:
|
| UseVersion2();
|
| ~UseVersion2();
|
| @@ -39,52 +39,55 @@ class UI_EXPORT UseVersion2 {
|
| // 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.
|
| -UI_EXPORT std::string GetTemplateHtml(const base::StringPiece& html_template,
|
| - const base::DictionaryValue* json,
|
| - const base::StringPiece& template_id);
|
| +UI_BASE_EXPORT std::string GetTemplateHtml(
|
| + const base::StringPiece& html_template,
|
| + const base::DictionaryValue* json,
|
| + 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.
|
| -UI_EXPORT std::string GetI18nTemplateHtml(
|
| +UI_BASE_EXPORT std::string GetI18nTemplateHtml(
|
| const base::StringPiece& html_template,
|
| const base::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.
|
| -UI_EXPORT std::string GetTemplatesHtml(const base::StringPiece& html_template,
|
| - const base::DictionaryValue* json,
|
| - const base::StringPiece& template_id);
|
| +UI_BASE_EXPORT std::string GetTemplatesHtml(
|
| + const base::StringPiece& html_template,
|
| + const base::DictionaryValue* json,
|
| + const base::StringPiece& template_id);
|
|
|
| // The following functions build up the different parts that the above
|
| // templates use.
|
|
|
| // Appends a script tag with a variable name |templateData| that has the JSON
|
| // assigned to it.
|
| -UI_EXPORT void AppendJsonHtml(const base::DictionaryValue* json,
|
| - std::string* output);
|
| +UI_BASE_EXPORT void AppendJsonHtml(const base::DictionaryValue* json,
|
| + std::string* output);
|
|
|
| // Same as AppendJsonHtml(), except does not include the <script></script>
|
| // tag wrappers.
|
| -UI_EXPORT void AppendJsonJS(const base::DictionaryValue* json,
|
| - std::string* output);
|
| +UI_BASE_EXPORT void AppendJsonJS(const base::DictionaryValue* json,
|
| + std::string* output);
|
|
|
| // Appends the source for JsTemplates in a script tag.
|
| -UI_EXPORT void AppendJsTemplateSourceHtml(std::string* output);
|
| +UI_BASE_EXPORT void AppendJsTemplateSourceHtml(std::string* output);
|
|
|
| // Appends the code that processes the JsTemplate with the JSON. You should
|
| // call AppendJsTemplateSourceHtml and AppendJsonHtml before calling this.
|
| -UI_EXPORT void AppendJsTemplateProcessHtml(const base::StringPiece& template_id,
|
| - std::string* output);
|
| +UI_BASE_EXPORT void AppendJsTemplateProcessHtml(
|
| + const base::StringPiece& template_id,
|
| + std::string* output);
|
|
|
| // Appends the source for i18n Templates in a script tag.
|
| -UI_EXPORT void AppendI18nTemplateSourceHtml(std::string* output);
|
| +UI_BASE_EXPORT void AppendI18nTemplateSourceHtml(std::string* output);
|
|
|
| // Appends the code that processes the i18n Template with the JSON. You
|
| // should call AppendJsTemplateSourceHtml and AppendJsonHtml before calling
|
| // this.
|
| -UI_EXPORT void AppendI18nTemplateProcessHtml(std::string* output);
|
| +UI_BASE_EXPORT void AppendI18nTemplateProcessHtml(std::string* output);
|
|
|
| } // namespace webui
|
|
|
|
|