diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 18:04:20 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-07 18:04:20 +0000 |
| commit | 1959c50c1bade879687830aaac5bbb7ac33481f1 (patch) | |
| tree | cc45776b15c5edcd30e77d717b1dfed6e338f40a /ui/base | |
| parent | eca0053f1a7e26ea94a71ffe1b9e1cb443fead67 (diff) | |
| download | chromium_src-1959c50c1bade879687830aaac5bbb7ac33481f1.zip chromium_src-1959c50c1bade879687830aaac5bbb7ac33481f1.tar.gz chromium_src-1959c50c1bade879687830aaac5bbb7ac33481f1.tar.bz2 | |
Desktop linux aura: Don't search for chrome_200_percent.pak.
chrome_200_percent.pak appears to only be built on chromeos. Each time a
process is spawned, several lines related to failing to load this data pak are
printed. #ifdefing it out stops the console sapm.
BUG=142661
Review URL: https://codereview.chromium.org/11362122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/resource/resource_bundle_aurax11.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc index f2b8bf0..ed2873f 100644 --- a/ui/base/resource/resource_bundle_aurax11.cc +++ b/ui/base/resource/resource_bundle_aurax11.cc @@ -37,11 +37,12 @@ void ResourceBundle::LoadCommonResources() { AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"), SCALE_FACTOR_100P); AddDataPackFromPath(GetResourcesPakFilePath( - "chrome_100_percent.pak"), - SCALE_FACTOR_100P); - AddOptionalDataPackFromPath(GetResourcesPakFilePath( - "chrome_200_percent.pak"), - SCALE_FACTOR_200P); + "chrome_100_percent.pak"), SCALE_FACTOR_100P); + + if (ui::IsScaleFactorSupported(SCALE_FACTOR_200P)) { + AddOptionalDataPackFromPath(GetResourcesPakFilePath( + "chrome_200_percent.pak"), SCALE_FACTOR_200P); + } } gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { |