Shifted patterns in tabs and background pattern over so that patterns line up...

chrome/browser/cocoa/browser_frame_view.mm

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/browser_frame_view.h"
 
 #import <objc/runtime.h>
 #import <Carbon/Carbon.h>
 
 #include "base/logging.h"
 #include "base/scoped_nsautorelease_pool.h"
 #import "chrome/browser/cocoa/chrome_browser_window.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
-// To line up our background pattern with the patterns in the tabs we need
-// to move our background patterns in the window frame up by two pixels.
-// This will make the themes look slightly different than in Windows/Linux
-// because of the differing heights between window top and tab top, but this
-// has been approved by UI.
-static const NSInteger kBrowserFrameViewPatternPhaseOffset = 2;
-
 @interface NSView (Swizzles)
 - (void)drawRectOriginal:(NSRect)rect;
 - (BOOL)_mouseInGroup:(NSButton*)widget;
 - (void)updateTrackingAreas;
 @end
 
 @implementation BrowserFrameView
 
 + (void)load {
   // This is where we swizzle drawRect, and add in two methods that we
@@ skipping 79 matching lines @@
   [[NSBezierPath bezierPathWithRect:rect] addClip];
 
   // Draw our background color if we have one, otherwise fall back on
   // system drawing.
   GTMTheme* theme = [self gtm_theme];
   GTMThemeState state = [window isMainWindow] ? GTMThemeStateActiveWindow
                                               : GTMThemeStateInactiveWindow;
   NSColor* color = [theme backgroundPatternColorForStyle:GTMThemeStyleWindow
                                                    state:state];
   if (color) {
-    // If we have a theme pattern, draw it here.
-    NSPoint phase = NSMakePoint(0, (NSHeight(windowRect) +
-                                    kBrowserFrameViewPatternPhaseOffset));
+    // If there is a theme pattern, draw it here.
+
+    // To line up the background pattern with the patterns in the tabs the
+    // background pattern in the window frame need to be moved up by two
+    // pixels and left by 5.
+    // This will make the themes look slightly different than in Windows/Linux
+    // because of the differing heights between window top and tab top, but this
+    // has been approved by UI.
+    static const NSPoint kBrowserFrameViewPatternPhaseOffset = { -5, 2 };
+    NSPoint phase = kBrowserFrameViewPatternPhaseOffset;
+    phase.y += NSHeight(windowRect);
     [[NSGraphicsContext currentContext] setPatternPhase:phase];
     [color set];
     NSRectFill(rect);
   }
 
   // Check to see if we have an overlay image.
   NSImage* overlayImage = [theme valueForAttribute:@"overlay"
                                              style:GTMThemeStyleWindow
                                              state:state];
   if (overlayImage) {
@@ skipping 27 matching lines @@
 - (void)updateTrackingAreas {
   [super updateTrackingAreas];
   if ([[self window] isKindOfClass:[ChromeBrowserWindow class]]) {
     ChromeBrowserWindow* window =
         static_cast<ChromeBrowserWindow*>([self window]);
     [window updateTrackingAreas];
   }
 }
 
 @end