diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 19:42:19 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-21 19:42:19 +0000 |
commit | 0c6c1e43289fc2e225a6c824aff40c9b63b5df78 (patch) | |
tree | 9ab1034e260c5887ecc7a70cd112cef97458582a /ui/webui | |
parent | ae0c0f6af00c25b6c41c9e37e8cb849de9a9a680 (diff) | |
download | chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.zip chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.gz chromium_src-0c6c1e43289fc2e225a6c824aff40c9b63b5df78.tar.bz2 |
Add base namespace to more values in sync and elsewhere.
This makes sync and net compile with no "using *Value".
BUG=
Review URL: https://codereview.chromium.org/17034006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207907 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/webui')
-rw-r--r-- | ui/webui/jstemplate_builder.cc | 10 | ||||
-rw-r--r-- | ui/webui/web_ui_util.cc | 4 | ||||
-rw-r--r-- | ui/webui/web_ui_util.h | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/ui/webui/jstemplate_builder.cc b/ui/webui/jstemplate_builder.cc index a65d538..681afbc 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"; diff --git a/ui/webui/web_ui_util.cc b/ui/webui/web_ui_util.cc index aeefcc5..4225514 100644 --- a/ui/webui/web_ui_util.cc +++ b/ui/webui/web_ui_util.cc @@ -58,7 +58,7 @@ std::string GetBitmapDataUrlFromResource(int res) { return str_url; } -WindowOpenDisposition GetDispositionFromClick(const ListValue* args, +WindowOpenDisposition GetDispositionFromClick(const base::ListValue* args, int start_index) { double button = 0.0; bool alt_key = false; @@ -127,7 +127,7 @@ void ParsePathAndScale(const GURL& url, } // static -void SetFontAndTextDirection(DictionaryValue* localized_strings) { +void SetFontAndTextDirection(base::DictionaryValue* localized_strings) { int web_font_family_id = IDS_WEB_FONT_FAMILY; int web_font_size_id = IDS_WEB_FONT_SIZE; #if defined(OS_WIN) diff --git a/ui/webui/web_ui_util.h b/ui/webui/web_ui_util.h index c1e3635..a3d297c 100644 --- a/ui/webui/web_ui_util.h +++ b/ui/webui/web_ui_util.h @@ -33,8 +33,9 @@ UI_EXPORT std::string GetBitmapDataUrlFromResource(int resource_id); // Extracts a disposition from click event arguments. |args| should contain // an integer button and booleans alt key, ctrl key, meta key, and shift key // (in that order), starting at |start_index|. -UI_EXPORT WindowOpenDisposition GetDispositionFromClick(const ListValue* args, - int start_index); +UI_EXPORT WindowOpenDisposition GetDispositionFromClick( + const base::ListValue* args, + int start_index); // Given a scale factor such as "1x", "2x" or "1.99x", sets |scale_factor| to // the closest ScaleFactor enum value for this scale factor. If string can not |