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

Unified Diff: chrome/common/jstemplate_builder.h

Issue 7259019: Move base/values.h into the base namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
Index: chrome/common/jstemplate_builder.h
===================================================================
--- chrome/common/jstemplate_builder.h (revision 92173)
+++ chrome/common/jstemplate_builder.h (working copy)
@@ -16,8 +16,8 @@
#include <string>
+namespace base {
class DictionaryValue;
-namespace base {
class StringPiece;
}
@@ -27,20 +27,20 @@
// string includes the HTML and the javascript code necessary to generate the
// full page with support for JsTemplates.
std::string GetTemplateHtml(const base::StringPiece& html_template,
- const DictionaryValue* json,
+ 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.
std::string GetI18nTemplateHtml(const base::StringPiece& html_template,
- const DictionaryValue* json);
+ 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.
std::string GetTemplatesHtml(const base::StringPiece& html_template,
- const DictionaryValue* json,
+ const base::DictionaryValue* json,
const base::StringPiece& template_id);
// The following functions build up the different parts that the above
@@ -48,11 +48,11 @@
// Appends a script tag with a variable name |templateData| that has the JSON
// assigned to it.
-void AppendJsonHtml(const DictionaryValue* json, std::string* output);
+void AppendJsonHtml(const base::DictionaryValue* json, std::string* output);
// Same as AppendJsonHtml(), execpt does not include the <script></script>
// tag wrappers.
-void AppendJsonJS(const DictionaryValue* json, std::string* output);
+void AppendJsonJS(const base::DictionaryValue* json, std::string* output);
// Appends the source for JsTemplates in a script tag.
void AppendJsTemplateSourceHtml(std::string* output);
« no previous file with comments | « chrome/common/json_schema_validator_unittest_base.h ('k') | chrome/common/net/gaia/google_service_auth_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698