diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 17:25:42 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 17:25:42 +0000 |
| commit | 059d76b564813ef7080175dec989122bdcda91bd (patch) | |
| tree | d6dea2fc9f3d4093f10621ca603b6e112506078d /ui | |
| parent | badba1ad344a4854a5b78112e1b83934c3dd7781 (diff) | |
| download | chromium_src-059d76b564813ef7080175dec989122bdcda91bd.zip chromium_src-059d76b564813ef7080175dec989122bdcda91bd.tar.gz chromium_src-059d76b564813ef7080175dec989122bdcda91bd.tar.bz2 | |
This CL ensures that favicons always
1) Stores a 1x representation in history
2) Returns a 1x representation upon calling FaviconService::GetFaviconImageForURL() such that the 1x favicon can be pushed to sync.
BUG=160503
Test=Manual, see instructions below
1) Go to http://www.corp.google.com/~pkotwicz/favicon_small_big/test.html on an iOS device and bookmark it. On the iOS device, the favicon should be red.
2) On a windows device, make sure that the favicon which is received via sync is blue
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=168079
Review URL: https://chromiumcodereview.appspot.com/11360233
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/layout.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index a17ffc6..40da14d 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -73,8 +73,10 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { static std::vector<ScaleFactor>* supported_scale_factors = new std::vector<ScaleFactor>(); if (supported_scale_factors->empty()) { - // 100P is always a supported scale factor. +#if !defined(OS_IOS) + // On platforms other than iOS, 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 @@ -85,6 +87,8 @@ std::vector<ScaleFactor>& GetSupportedScaleFactorsInternal() { 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()) |