diff options
| author | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 12:31:12 +0000 |
|---|---|---|
| committer | noyau@chromium.org <noyau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-12 12:31:12 +0000 |
| commit | a369c2f2af88d590c4a309f7c2e92b707f7c5ed6 (patch) | |
| tree | f54b73753785f5f33d033b242ae9d400734b49d0 /ui/base/layout.cc | |
| parent | a38bdda0c894ea19e90d5c37589943c9e08c15ef (diff) | |
| download | chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.zip chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.tar.gz chromium_src-a369c2f2af88d590c4a309f7c2e92b707f7c5ed6.tar.bz2 | |
Always add 100P scale format in the supported format list.
Align iOS with the other platforms and add 100P to the list of supported
scale formats.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11293147
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/layout.cc')
| -rw-r--r-- | ui/base/layout.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index 6fef499..98df1e1 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -73,18 +73,18 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { static std::vector<ScaleFactor>* supported_scale_factors = new std::vector<ScaleFactor>(); if (supported_scale_factors->empty()) { -#if !defined(OS_IOS) - // On platforms other than iOS, 100P is always a supported scale factor. + // 100P is always a supported scale factor. supported_scale_factors->push_back(SCALE_FACTOR_100P); -#endif #if defined(OS_IOS) + // TODO(ios): 100p should not be necessary on iOS retina devices. However + // the sync service only supports syncing 100p favicons. Until sync supports + // other scales 100p is needed in the list of scale factors to retrieve and + // store the favicons in both 100p for sync and 200p for display. cr/160503. gfx::Display display = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay(); if (display.device_scale_factor() > 1.0) { DCHECK_EQ(2.0, display.device_scale_factor()); supported_scale_factors->push_back(SCALE_FACTOR_200P); - } else { - supported_scale_factors->push_back(SCALE_FACTOR_100P); } #elif defined(OS_MACOSX) if (base::mac::IsOSLionOrLater()) |