diff options
Diffstat (limited to 'chrome')
7 files changed, 20 insertions, 20 deletions
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 7349a8e..1866d4d 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -210,7 +210,7 @@ class Writer : public Task { break; case CONTENT: - utf8_string = EscapeForHTML(text); + utf8_string = net::EscapeForHTML(text); break; default: diff --git a/chrome/browser/bookmarks/bookmark_node_data.cc b/chrome/browser/bookmarks/bookmark_node_data.cc index 9151124..9b2a333 100644 --- a/chrome/browser/bookmarks/bookmark_node_data.cc +++ b/chrome/browser/bookmarks/bookmark_node_data.cc @@ -149,7 +149,7 @@ void BookmarkNodeData::WriteToClipboard(Profile* profile) const { const std::string url = elements[0].url.spec(); scw.WriteBookmark(title, url); - scw.WriteHyperlink(EscapeForHTML(title), url); + scw.WriteHyperlink(net::EscapeForHTML(title), url); // Also write the URL to the clipboard as text so that it can be pasted // into text fields. We use WriteText instead of WriteURL because we don't diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 3761e220..c081cd3 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -402,7 +402,7 @@ void AppendHeader(std::string* output, int refresh, output->append("<!DOCTYPE HTML>\n<html>\n<head>\n"); if (!unescaped_title.empty()) { output->append("<title>"); - output->append(EscapeForHTML(unescaped_title)); + output->append(net::EscapeForHTML(unescaped_title)); output->append("</title>\n"); } output->append("<meta charset=\"utf-8\">\n"); diff --git a/chrome/browser/chromeos/notifications/system_notification_factory.cc b/chrome/browser/chromeos/notifications/system_notification_factory.cc index ab7568c..f0635d1 100644 --- a/chrome/browser/chromeos/notifications/system_notification_factory.cc +++ b/chrome/browser/chromeos/notifications/system_notification_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -35,8 +35,8 @@ Notification SystemNotificationFactory::Create( std::vector<std::string> subst; int resource = IDR_NOTIFICATION_ICON_HTML; subst.push_back(icon.spec()); - subst.push_back(EscapeForHTML(UTF16ToUTF8(title))); - subst.push_back(EscapeForHTML(UTF16ToUTF8(text))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(title))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(text))); // icon float position subst.push_back(dir == WebKit::WebTextDirectionRightToLeft ? "right" : "left"); @@ -46,7 +46,7 @@ Notification SystemNotificationFactory::Create( // if link is not empty, then use template with link if (!link.empty()) { resource = IDR_NOTIFICATION_ICON_LINK_HTML; - subst.push_back(EscapeForHTML(UTF16ToUTF8(link))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(link))); } string16 content_url = DesktopNotificationService::CreateDataUrl(resource, diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 88f9ea2..09451ed 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -170,8 +170,8 @@ string16 DesktopNotificationService::CreateDataUrl( if (icon_url.is_valid()) { resource = IDR_NOTIFICATION_ICON_HTML; subst.push_back(icon_url.spec()); - subst.push_back(EscapeForHTML(UTF16ToUTF8(title))); - subst.push_back(EscapeForHTML(UTF16ToUTF8(body))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(title))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(body))); // icon float position subst.push_back(dir == WebKit::WebTextDirectionRightToLeft ? "right" : "left"); @@ -181,12 +181,12 @@ string16 DesktopNotificationService::CreateDataUrl( // Strings are div names in the template file. string16 line_name = title.empty() ? ASCIIToUTF16("description") : ASCIIToUTF16("title"); - subst.push_back(EscapeForHTML(UTF16ToUTF8(line_name))); - subst.push_back(EscapeForHTML(UTF16ToUTF8(line))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(line_name))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(line))); } else { resource = IDR_NOTIFICATION_2LINE_HTML; - subst.push_back(EscapeForHTML(UTF16ToUTF8(title))); - subst.push_back(EscapeForHTML(UTF16ToUTF8(body))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(title))); + subst.push_back(net::EscapeForHTML(UTF16ToUTF8(body))); } // body text direction subst.push_back(dir == WebKit::WebTextDirectionRightToLeft ? diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc index ae13c7b..3d41cbf 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc @@ -1323,7 +1323,7 @@ void OmniboxViewWin::OnCopy() { scw.WriteText(text); if (write_url) { scw.WriteBookmark(text, url.spec()); - scw.WriteHyperlink(EscapeForHTML(text), url.spec()); + scw.WriteHyperlink(net::EscapeForHTML(text), url.spec()); } } diff --git a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc b/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc index dac9f1b..afd5def 100644 --- a/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc +++ b/chrome/renderer/safe_browsing/malware_dom_details_browsertest.cc @@ -56,10 +56,10 @@ TEST_F(MalwareDOMDetailsTest, Everything) { // \ iframe2 std::string iframe2_html = "<html><body>iframe2</body></html>"; GURL iframe2_url(urlprefix + iframe2_html); - std::string iframe1_html = "<iframe src=\"" + EscapeForHTML( + std::string iframe1_html = "<iframe src=\"" + net::EscapeForHTML( iframe2_url.spec()) + "\"></iframe>"; GURL iframe1_url(urlprefix + iframe1_html); - std::string html = "<html><head><iframe src=\"" + EscapeForHTML( + std::string html = "<html><head><iframe src=\"" + net::EscapeForHTML( iframe1_url.spec()) + "\"></iframe></head></html>"; GURL url(urlprefix + html); @@ -100,8 +100,8 @@ TEST_F(MalwareDOMDetailsTest, Everything) { std::string html = ""; for (int i = 0; i < 55; ++i) { // The iframe contents is just a number. - GURL iframe_url(StringPrintf("%s%d", urlprefix, i)); - html += "<iframe src=\"" + EscapeForHTML(iframe_url.spec()) + + GURL iframe_url(base::StringPrintf("%s%d", urlprefix, i)); + html += "<iframe src=\"" + net::EscapeForHTML(iframe_url.spec()) + "\"></iframe>"; } GURL url(urlprefix + html); @@ -116,8 +116,8 @@ TEST_F(MalwareDOMDetailsTest, Everything) { std::string html = ""; for (int i = 0; i < 55; ++i) { // The iframe contents is just a number. - GURL script_url(StringPrintf("%s%d", urlprefix, i)); - html += "<script src=\"" + EscapeForHTML(script_url.spec()) + + GURL script_url(base::StringPrintf("%s%d", urlprefix, i)); + html += "<script src=\"" + net::EscapeForHTML(script_url.spec()) + "\"></script>"; } GURL url(urlprefix + html); |