summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 20:49:05 +0000
committerjhorwich@chromium.org <jhorwich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-13 20:49:05 +0000
commit9fe7ee63a4925d6e5c2d0a763b3871d9e3d44960 (patch)
tree9743f9850f34f71c5c0029ac238216961ee31855
parentfc0f66aecd2512b84dde8d02b4f9a11c0041741d (diff)
downloadchromium_src-9fe7ee63a4925d6e5c2d0a763b3871d9e3d44960.zip
chromium_src-9fe7ee63a4925d6e5c2d0a763b3871d9e3d44960.tar.gz
chromium_src-9fe7ee63a4925d6e5c2d0a763b3871d9e3d44960.tar.bz2
Fix to avoid SkASSERT caused by passing SkScalar type to SkIntToScalar
BUG=85666 TEST=1. Build chromeos build of chromium (GYP_DEFINES="chromeos=1", cros_deps in .gclient) 2. Run with ./chrome --enable-vertical-tabs (also use --chromeos-frame if you wish) 3. Right-click on a tab and choose "Use side tabs" Review URL: http://codereview.chromium.org/7134094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88894 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/tabs/side_tab.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/views/tabs/side_tab.cc b/chrome/browser/ui/views/tabs/side_tab.cc
index 0a63faf..00cc579 100644
--- a/chrome/browser/ui/views/tabs/side_tab.cc
+++ b/chrome/browser/ui/views/tabs/side_tab.cc
@@ -17,7 +17,7 @@
namespace {
const int kVerticalTabHeight = 27;
const int kTitleCloseSpacing = 4;
-const SkScalar kRoundRectRadius = 4;
+const int kRoundRectRadius = 4;
const SkColor kTabBackgroundColor = SK_ColorWHITE;
const SkColor kTextColor = SK_ColorBLACK;