summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 12:24:57 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-06 12:24:57 +0000
commit6c3184b561e0d8171383b0b16beccd01e409f631 (patch)
treef9d64fe4b9324c45db1ca47dfc85835415330703
parent7bcfea4811a629b458ad7d754a4b60bd58657b75 (diff)
downloadchromium_src-6c3184b561e0d8171383b0b16beccd01e409f631.zip
chromium_src-6c3184b561e0d8171383b0b16beccd01e409f631.tar.gz
chromium_src-6c3184b561e0d8171383b0b16beccd01e409f631.tar.bz2
Fix the scale factor used for loading chrome.pak on iOS
chrome.pak is non-scaled data, so should use NONE BUG=None Review URL: https://chromiumcodereview.appspot.com/14847006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198427 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/base/resource/resource_bundle_ios.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/resource/resource_bundle_ios.mm b/ui/base/resource/resource_bundle_ios.mm
index 4913d6e..f4919d7 100644
--- a/ui/base/resource/resource_bundle_ios.mm
+++ b/ui/base/resource/resource_bundle_ios.mm
@@ -45,7 +45,7 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
- ui::SCALE_FACTOR_100P);
+ ui::SCALE_FACTOR_NONE);
if (IsScaleFactorSupported(SCALE_FACTOR_100P)) {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent", nil),