summaryrefslogtreecommitdiffstats
path: root/chrome/browser/safe_browsing
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 04:21:36 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 04:21:36 +0000
commit02e24270eaa44c166ae89be7cb85b09f262f399b (patch)
tree13f4f6ed3994a2a0a2ad28625f92ff549eca4f70 /chrome/browser/safe_browsing
parentb2872394ad921258f724f16c63cceb635ea740d5 (diff)
downloadchromium_src-02e24270eaa44c166ae89be7cb85b09f262f399b.zip
chromium_src-02e24270eaa44c166ae89be7cb85b09f262f399b.tar.gz
chromium_src-02e24270eaa44c166ae89be7cb85b09f262f399b.tar.bz2
Remove a ResourceBundle::GetDataResource and convert people to
the StringPiece version. In most cases, I didn't bother trying to make the calling code more efficient since nothing seems to be in time sensitive code. Review URL: http://codereview.chromium.org/2827001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
-rw-r--r--chrome/browser/safe_browsing/safe_browsing_blocking_page.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index c3481fc..0e0cf4b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -122,16 +122,17 @@ std::string SafeBrowsingBlockingPage::GetHTMLContents() {
if (unsafe_resources_.size() > 1) {
PopulateMultipleThreatStringDictionary(&strings);
- html = rb.GetDataResource(IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK);
+ html = rb.GetRawDataResource(
+ IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK).as_string();
} else if (unsafe_resources_[0].threat_type ==
SafeBrowsingService::URL_MALWARE) {
PopulateMalwareStringDictionary(&strings);
- html = rb.GetDataResource(IDR_SAFE_BROWSING_MALWARE_BLOCK);
+ html = rb.GetRawDataResource(IDR_SAFE_BROWSING_MALWARE_BLOCK).as_string();
} else { // Phishing.
DCHECK(unsafe_resources_[0].threat_type ==
SafeBrowsingService::URL_PHISHING);
PopulatePhishingStringDictionary(&strings);
- html = rb.GetDataResource(IDR_SAFE_BROWSING_PHISHING_BLOCK);
+ html = rb.GetRawDataResource(IDR_SAFE_BROWSING_PHISHING_BLOCK).as_string();
}
return jstemplate_builder::GetTemplatesHtml(html, &strings, "template_root");