diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 04:15:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-14 04:15:42 +0000 |
| commit | 6542a57b3ab7317f5bbf06990ce98bfb259bc7af (patch) | |
| tree | d5c9352951380f827315236c7d42df505957308f | |
| parent | bdd317a9a904db6ccb12a8dbf7a839862a07065c (diff) | |
| download | chromium_src-6542a57b3ab7317f5bbf06990ce98bfb259bc7af.zip chromium_src-6542a57b3ab7317f5bbf06990ce98bfb259bc7af.tar.gz chromium_src-6542a57b3ab7317f5bbf06990ce98bfb259bc7af.tar.bz2 | |
mac: Minor bug fix: 2.5 cannot be stored in an int.
Found by clang's newly enabled -Wliteral-conversion:
../../chrome/browser/ui/cocoa/download/download_item_cell.mm:75:40: error: implicit conversion turns literal floating-point number into integer: 'double' to 'const int' [-Werror,-Wliteral-conversion]
const int kCompleteAnimationDuration = 2.5;
~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~
../../chrome/browser/ui/cocoa/download/download_item_cell.mm:78:43: error: implicit conversion turns literal floating-point number into integer: 'double' to 'const int' [-Werror,-Wliteral-conversion]
const int kInterruptedAnimationDuration = 2.5;
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^~~
2 errors generated.
BUG=none
TEST=download animation runs 0.5s longer.
Review URL: http://codereview.chromium.org/10082026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132324 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/download/download_item_cell.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index 14a666c..a16eba9 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -72,10 +72,10 @@ NSTimeInterval kShowStatusDuration = 0.3; NSTimeInterval kHideStatusDuration = 0.3; // Duration of the 'download complete' animation, in seconds. -const int kCompleteAnimationDuration = 2.5; +const CGFloat kCompleteAnimationDuration = 2.5; // Duration of the 'download interrupted' animation, in seconds. -const int kInterruptedAnimationDuration = 2.5; +const CGFloat kInterruptedAnimationDuration = 2.5; using content::DownloadItem; |