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

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

Issue 1487283005: Implement the new Sync Confirmation dialog on Linux and Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments and use Polymer where relevant. Created 4 years, 11 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
Index: chrome/browser/chromeos/login/helper.cc
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 56a3f549a63647fc0ab5b784aab1b9d169d69fba..ce9743fba68a9d2439fbb6b0636034b3a24b228c 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -97,13 +97,13 @@ gfx::Rect CalculateScreenBounds(const gfx::Size& size) {
return bounds;
}
-int GetCurrentUserImageSize() {
+unsigned int GetCurrentUserImageSize() {
// The biggest size that the profile picture is displayed at is currently
// 220px, used for the big preview on OOBE and Change Picture options page.
- static const int kBaseUserImageSize = 220;
+ static const unsigned int kBaseUserImageSize = 220;
float scale_factor = gfx::Display::GetForcedDeviceScaleFactor();
if (scale_factor > 1.0f)
- return static_cast<int>(scale_factor * kBaseUserImageSize);
+ return static_cast<unsigned int>(scale_factor * kBaseUserImageSize);
return kBaseUserImageSize * gfx::ImageSkia::GetMaxSupportedScale();
}

Powered by Google App Engine
This is Rietveld 408576698