summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/cocoa/background_gradient_view.mm12
-rw-r--r--chrome/browser/cocoa/tab_view.mm3
2 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/cocoa/background_gradient_view.mm b/chrome/browser/cocoa/background_gradient_view.mm
index 0be2f56..df3527a 100644
--- a/chrome/browser/cocoa/background_gradient_view.mm
+++ b/chrome/browser/cocoa/background_gradient_view.mm
@@ -52,10 +52,14 @@
CGFloat winHeight = NSHeight([[self window] frame]);
NSGradient *gradient = [theme gradientForStyle:GTMThemeStyleToolBar
state:isKey];
- NSPoint startPoint = [self convertPointFromBase:
- NSMakePoint(0, winHeight - kToolbarTopOffset)];
- NSPoint endPoint = [self convertPointFromBase:
- NSMakePoint(0, winHeight - kToolbarTopOffset - kToolbarMaxHeight)];
+ NSPoint startPoint =
+ [self convertPoint:NSMakePoint(0, winHeight - kToolbarTopOffset)
+ fromView:nil];
+ NSPoint endPoint =
+ [self convertPoint:NSMakePoint(0, winHeight -
+ kToolbarTopOffset -
+ kToolbarMaxHeight)
+ fromView:nil];
[gradient drawFromPoint:startPoint
toPoint:endPoint
diff --git a/chrome/browser/cocoa/tab_view.mm b/chrome/browser/cocoa/tab_view.mm
index 5d09f2c..a8d9fb5 100644
--- a/chrome/browser/cocoa/tab_view.mm
+++ b/chrome/browser/cocoa/tab_view.mm
@@ -13,9 +13,6 @@ static const CGFloat kInsetMultiplier = 2.0/3.0;
static const CGFloat kControlPoint1Multiplier = 1.0/3.0;
static const CGFloat kControlPoint2Multiplier = 3.0/8.0;
-static const CGFloat kToolbarTopOffset = 12;
-static const CGFloat kToolbarMaxHeight = 128;
-
@implementation TabView
@synthesize state = state_;