diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 23:26:28 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 23:26:28 +0000 |
| commit | bc065abe8e22eb604915d9e48d8983142a51d0c3 (patch) | |
| tree | 24bda6e7787c40c9516bf001fae9dd9933e5d81e | |
| parent | 4d4809d93a8b7042a576ffd97bd78368d56538f9 (diff) | |
| download | chromium_src-bc065abe8e22eb604915d9e48d8983142a51d0c3.zip chromium_src-bc065abe8e22eb604915d9e48d8983142a51d0c3.tar.gz chromium_src-bc065abe8e22eb604915d9e48d8983142a51d0c3.tar.bz2 | |
Merge 114110 - Revert "Force tabs to be integer widths."
This reverts commit r112107.
BUG=107269
TEST=as in bug
Review URL: http://codereview.chromium.org/8928001
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/8922020
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@114113 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 89fd994..5da896c 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -6,7 +6,6 @@ #import <QuartzCore/QuartzCore.h> -#include <cmath> #include <limits> #include <string> @@ -859,8 +858,7 @@ private: availableSpaceForNonMini += (numberOfOpenNonMiniTabs - 1) * kTabOverlap; // Divide up the space between the non-mini-tabs. - nonMiniTabWidth = - std::floor(availableSpaceForNonMini / numberOfOpenNonMiniTabs); + nonMiniTabWidth = availableSpaceForNonMini / numberOfOpenNonMiniTabs; // Clamp the width between the max and min. nonMiniTabWidth = MAX(MIN(nonMiniTabWidth, kMaxTabWidth), kMinTabWidth); |