Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3502)

Unified Diff: chrome/browser/ui/cocoa/browser_window_controller.mm

Issue 7734003: Implement basic theming for panel titlebars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 5a7cdc29b4198942a1779a4702f73e96d20aa6e0..6444bbce94fb7c45801a7a0a15062afe12f7b5b8 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -35,6 +35,7 @@
#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"
@@ -1587,39 +1588,9 @@ enum {
}
- (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 {

Powered by Google App Engine
This is Rietveld 408576698