diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 11:04:57 +0000 |
| commit | c49201a506dba0e3a04aad623e4b259f948f3159 (patch) | |
| tree | 2a93fff52861f5c8dd87e23bc23d170b7cb1309e /chrome/browser/safe_browsing | |
| parent | 16bb3c2f909662329b117e063280f6cfc2cca3f9 (diff) | |
| download | chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.zip chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.gz chromium_src-c49201a506dba0e3a04aad623e4b259f948f3159.tar.bz2 | |
Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."
Relanding original CL 137734, http://codereview.chromium.org/10387010/.
TBR=aa,abodenha,ben,sail,tony
BUG=123611
TEST=All try bots pass and aura runs without errors.
Review URL: https://chromiumcodereview.appspot.com/10412004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138769 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/safe_browsing')
| -rw-r--r-- | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 10 |
1 files changed, 7 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 dd3c3b2..1e9f7be 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -38,6 +38,7 @@ #include "grit/locale_settings.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" using content::BrowserThread; @@ -195,20 +196,23 @@ std::string SafeBrowsingBlockingPage::GetHTMLContents() { if (unsafe_resources_.size() > 1) { PopulateMultipleThreatStringDictionary(&strings); html = rb.GetRawDataResource( - IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK).as_string(); + IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK, + ui::SCALE_FACTOR_NONE).as_string(); } else { SafeBrowsingService::UrlCheckResult threat_type = unsafe_resources_[0].threat_type; if (threat_type == SafeBrowsingService::URL_MALWARE) { PopulateMalwareStringDictionary(&strings); html = rb.GetRawDataResource( - IDR_SAFE_BROWSING_MALWARE_BLOCK).as_string(); + IDR_SAFE_BROWSING_MALWARE_BLOCK, + ui::SCALE_FACTOR_NONE).as_string(); } else { // Phishing. DCHECK(threat_type == SafeBrowsingService::URL_PHISHING || threat_type == SafeBrowsingService::CLIENT_SIDE_PHISHING_URL); PopulatePhishingStringDictionary(&strings); html = rb.GetRawDataResource( - IDR_SAFE_BROWSING_PHISHING_BLOCK).as_string(); + IDR_SAFE_BROWSING_PHISHING_BLOCK, + ui::SCALE_FACTOR_NONE).as_string(); } } |