diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 00:08:28 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 00:08:28 +0000 |
| commit | 1e61a9f8cd916315b99872399d6a9a9196d807b5 (patch) | |
| tree | f21fea71c849abeb4e3f842ee6adf12b5a49b9aa /ui | |
| parent | 08d06fa11cbf9fb37800d99f97b6df529bc23c10 (diff) | |
| download | chromium_src-1e61a9f8cd916315b99872399d6a9a9196d807b5.zip chromium_src-1e61a9f8cd916315b99872399d6a9a9196d807b5.tar.gz chromium_src-1e61a9f8cd916315b99872399d6a9a9196d807b5.tar.bz2 | |
Revert 168079 - 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
Review URL: https://chromiumcodereview.appspot.com/11360233
TBR=pkotwicz@chromium.org
Review URL: https://codereview.chromium.org/11418021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168088 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/layout.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui/base/layout.cc b/ui/base/layout.cc index 801ba19..a17ffc6 100644 --- a/ui/base/layout.cc +++ b/ui/base/layout.cc @@ -73,10 +73,8 @@ 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 |