Implement basic theming for panel titlebars.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include <cmath>
 #include <numeric>
@@ skipping 17 matching lines @@
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
 #import "chrome/browser/ui/cocoa/browser/avatar_button.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
+#import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h"
 #import "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/image_utils.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
@@ skipping 1532 matching lines @@
 
   if (browser_->is_devtools())
     style |= THEMED_DEVTOOLS;
   if (browser_->is_type_popup())
     style |= THEMED_POPUP;
 
   return style;
 }
 
 - (NSPoint)themePatternPhase {
-  // Our patterns want to be drawn from the upper left hand corner of the view.
-  // Cocoa wants to do it from the lower left of the window.
-  //
-  // Rephase our pattern to fit this view. Some other views (Tabs, Toolbar etc.)
-  // will phase their patterns relative to this so all the views look right.
-  //
-  // To line up the background pattern with the pattern in the browser window
-  // the background pattern for the tabs needs to be moved left by 5 pixels.
-  const CGFloat kPatternHorizontalOffset = -5;
-  // To match Windows and CrOS, have to offset vertically by 2 pixels.
-  // Without tab strip, offset an extra pixel (determined by experimentation).
-  const CGFloat kPatternVerticalOffset = 2;
-  const CGFloat kPatternVerticalOffsetNoTabStrip = 3;
-
-  // When we have a tab strip, line up with the top of the tab, otherwise,
-  // line up with the top of the window.
   NSView* windowChromeView = [[[self window] contentView] superview];
-  if ([self hasTabStrip]) {
-    NSView* tabStripView = [self tabStripView];
-    NSRect tabStripViewWindowBounds = [tabStripView bounds];
-    tabStripViewWindowBounds =
-        [tabStripView convertRect:tabStripViewWindowBounds
-                           toView:windowChromeView];
-    return NSMakePoint(NSMinX(tabStripViewWindowBounds)
-                           + kPatternHorizontalOffset,
-                       NSMinY(tabStripViewWindowBounds)
-                           + [TabStripController defaultTabHeight]
-                           + kPatternVerticalOffset);
-  } else {
-    return NSMakePoint(kPatternHorizontalOffset,
-                       NSHeight([windowChromeView bounds])
-                       + kPatternVerticalOffsetNoTabStrip);
-  }
+  return [BrowserWindowUtils themePatternPhaseFor:windowChromeView
+                                     withTabStrip:[self tabStripView]];
 }
 
 - (NSPoint)bookmarkBubblePoint {
   return [toolbarController_ bookmarkBubblePoint];
 }
 
 // Show the bookmark bubble (e.g. user just clicked on the STAR).
 - (void)showBookmarkBubbleForURL:(const GURL&)url
                alreadyBookmarked:(BOOL)alreadyMarked {
   if (!bookmarkBubbleController_) {
@@ skipping 552 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)