Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Unified Diff: ui/webui/jstemplate_builder.cc

Issue 17034006: Add base namespace to more values in sync and elsewhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/json_schema_compiler/util.cc ('k') | ui/webui/web_ui_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/webui/jstemplate_builder.cc
diff --git a/ui/webui/jstemplate_builder.cc b/ui/webui/jstemplate_builder.cc
index a65d538c77a2ea0e4cee5d3b5d03cc025130a187..681afbcefd95188e6baa85b0a82fb80067723aeb 100644
--- a/ui/webui/jstemplate_builder.cc
+++ b/ui/webui/jstemplate_builder.cc
@@ -33,7 +33,7 @@ UseVersion2::~UseVersion2() {
}
std::string GetTemplateHtml(const base::StringPiece& html_template,
- const DictionaryValue* json,
+ const base::DictionaryValue* json,
const base::StringPiece& template_id) {
std::string output(html_template.data(), html_template.size());
AppendJsonHtml(json, &output);
@@ -43,7 +43,7 @@ std::string GetTemplateHtml(const base::StringPiece& html_template,
}
std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
- const DictionaryValue* json) {
+ const base::DictionaryValue* json) {
std::string output(html_template.data(), html_template.size());
AppendJsonHtml(json, &output);
AppendI18nTemplateSourceHtml(&output);
@@ -52,7 +52,7 @@ std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
}
std::string GetTemplatesHtml(const base::StringPiece& html_template,
- const DictionaryValue* json,
+ const base::DictionaryValue* json,
const base::StringPiece& template_id) {
std::string output(html_template.data(), html_template.size());
AppendI18nTemplateSourceHtml(&output);
@@ -63,7 +63,7 @@ std::string GetTemplatesHtml(const base::StringPiece& html_template,
return output;
}
-void AppendJsonHtml(const DictionaryValue* json, std::string* output) {
+void AppendJsonHtml(const base::DictionaryValue* json, std::string* output) {
std::string javascript_string;
AppendJsonJS(json, &javascript_string);
@@ -76,7 +76,7 @@ void AppendJsonHtml(const DictionaryValue* json, std::string* output) {
output->append("</script>");
}
-void AppendJsonJS(const DictionaryValue* json, std::string* output) {
+void AppendJsonJS(const base::DictionaryValue* json, std::string* output) {
// Convert the template data to a json string.
DCHECK(json) << "must include json data structure";
« no previous file with comments | « tools/json_schema_compiler/util.cc ('k') | ui/webui/web_ui_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698