Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/chrome/browser/chromeos/login/helper.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | trunk/src/chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/chromeos/login/helper.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/helper.cc (revision 224497)
+++ trunk/src/chrome/browser/chromeos/login/helper.cc (working copy)
@@ -15,7 +15,6 @@
#include "third_party/cros_system_api/dbus/service_constants.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/screen.h"
namespace chromeos {
@@ -37,7 +36,8 @@
float scale_factor = gfx::Display::GetForcedDeviceScaleFactor();
if (scale_factor > 1.0f)
return static_cast<int>(scale_factor * kBaseUserImageSize);
- return kBaseUserImageSize * gfx::ImageSkia::GetMaxSupportedScale();
+ return kBaseUserImageSize *
+ ui::GetScaleFactorScale(ui::GetMaxScaleFactor());
}
namespace login {
« no previous file with comments | « trunk/src/chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | trunk/src/chrome/browser/chromeos/login/wallpaper_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698