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

Unified Diff: chrome/browser/ui/cocoa/history_overlay_controller.mm

Issue 10825447: chrome/browser should build on the x86_64 architecture (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebased on the updated trunk. Created 8 years, 4 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/ui/cocoa/history_overlay_controller.mm
diff --git a/chrome/browser/ui/cocoa/history_overlay_controller.mm b/chrome/browser/ui/cocoa/history_overlay_controller.mm
index 2620aa8a162d9113d4826f4236bccdbbc095cf6c..4cf44a07578f7784beb0bebcbfe1362e0351f8fb 100644
--- a/chrome/browser/ui/cocoa/history_overlay_controller.mm
+++ b/chrome/browser/ui/cocoa/history_overlay_controller.mm
@@ -112,7 +112,9 @@ const CGFloat kGestureCompleteProgress = 0.3;
// When tracking the gesture, the height is constant and the alpha value
// changes from [0.25, 0.65].
CGFloat height = kShieldHeight;
- CGFloat shieldAlpha = std::min(0.65f, std::max(gestureAmount, 0.25f));
+ CGFloat shieldAlpha = std::min(static_cast<CGFloat>(0.65),
+ std::max(gestureAmount,
+ static_cast<CGFloat>(0.25)));
// When the gesture is very likely to be completed (90% in this case), grow
// the semicircle's height and lock the alpha to 0.75.
« no previous file with comments | « chrome/browser/ui/cocoa/history_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/notifications/balloon_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698