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

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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/browser/safe_browsing/safe_browsing_blocking_page.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index dd3c3b2eec7f28c02cd45794cfa0870940dde48e..1e9f7be9634f14030a2c7b3b343d743f1cbc85aa 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();
}
}

Powered by Google App Engine
This is Rietveld 408576698