diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 03:25:48 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-24 03:25:48 +0000 |
| commit | 50b66263c3a926fd1de75248fb2100e72715696e (patch) | |
| tree | a4ad06309d29bacf1c6de692a20f7d214f8ea7ab /apps | |
| parent | 2fa342b8ed9c8777f78b3ba8b344dab24a04ef97 (diff) | |
| download | chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.zip chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.tar.gz chromium_src-50b66263c3a926fd1de75248fb2100e72715696e.tar.bz2 | |
Remove dependency on ui::ScaleFactor from ui/gfx
As part of the work to removed dependencies on ui/base from ui/gfx I have
changed the public api to Canvas, ImageSkia, ImageSkiaRep and ImagePNGRep
to take float scale values instead of ui::ScaleFactor.
The notion of supported scale factors has been broken into 2 parts.
ui::SetSupportedScaleFactors remains and calls the
new ImageSkia::SetSupportedScales().
The initialization of the supported scale factors has been moved from layout.h
into ResourceBundle, and is done explicitly in tests that don't use
ResourceBundle.
BUG=103304
R=ben@chromium.org, oshima@chromium.org, sky@chromium.org
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=224473
Review URL: https://codereview.chromium.org/24175004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell_window.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 44a3858..cd8ddd0 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -457,7 +457,7 @@ void ShellWindow::UpdateExtensionAppIcon() { // Triggers actual image loading with 1x resources. The 2x resource will // be handled by IconImage class when requested. - app_icon_image_->image_skia().GetRepresentation(ui::SCALE_FACTOR_100P); + app_icon_image_->image_skia().GetRepresentation(1.0f); } void ShellWindow::CloseContents(WebContents* contents) { |