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

Side by Side Diff: chrome/browser/ui/cocoa/toolbar/toolbar_view.mm

Issue 19918002: Refactor [FramedBrowserWindow drawWindowThemeInDirtyRect:] to use themeImagePositionForAlignment: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/cocoa/themed_window.mm ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view.h"
6 6
7 #import "chrome/browser/ui/cocoa/themed_window.h" 7 #import "chrome/browser/ui/cocoa/themed_window.h"
8 #import "chrome/browser/ui/cocoa/view_id_util.h" 8 #import "chrome/browser/ui/cocoa/view_id_util.h"
9 #import "ui/base/cocoa/nsgraphics_context_additions.h" 9 #import "ui/base/cocoa/nsgraphics_context_additions.h"
10 10
11 @implementation ToolbarView 11 @implementation ToolbarView
12 12
13 @synthesize dividerOpacity = dividerOpacity_; 13 @synthesize dividerOpacity = dividerOpacity_;
14 14
15 // Prevent mouse down events from moving the parent window around. 15 // Prevent mouse down events from moving the parent window around.
16 - (BOOL)mouseDownCanMoveWindow { 16 - (BOOL)mouseDownCanMoveWindow {
17 return NO; 17 return NO;
18 } 18 }
19 19
20 - (void)drawRect:(NSRect)rect { 20 - (void)drawRect:(NSRect)rect {
21 NSPoint phase = [[self window] 21 NSPoint position = [[self window]
22 themePatternPhaseForAlignment:THEME_PATTERN_ALIGN_WITH_TAB_STRIP]; 22 themeImagePositionForAlignment:THEME_IMAGE_ALIGN_WITH_TAB_STRIP];
23 [[NSGraphicsContext currentContext] cr_setPatternPhase:phase forView:self]; 23 [[NSGraphicsContext currentContext] cr_setPatternPhase:position forView:self];
24 [self drawBackgroundWithOpaque:YES]; 24 [self drawBackgroundWithOpaque:YES];
25 } 25 }
26 26
27 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity. 27 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity.
28 - (NSColor*)strokeColor { 28 - (NSColor*)strokeColor {
29 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]]; 29 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]];
30 } 30 }
31 31
32 - (BOOL)accessibilityIsIgnored { 32 - (BOOL)accessibilityIsIgnored {
33 return NO; 33 return NO;
34 } 34 }
35 35
36 - (id)accessibilityAttributeValue:(NSString*)attribute { 36 - (id)accessibilityAttributeValue:(NSString*)attribute {
37 if ([attribute isEqual:NSAccessibilityRoleAttribute]) 37 if ([attribute isEqual:NSAccessibilityRoleAttribute])
38 return NSAccessibilityToolbarRole; 38 return NSAccessibilityToolbarRole;
39 39
40 return [super accessibilityAttributeValue:attribute]; 40 return [super accessibilityAttributeValue:attribute];
41 } 41 }
42 42
43 - (ViewID)viewID { 43 - (ViewID)viewID {
44 return VIEW_ID_TOOLBAR; 44 return VIEW_ID_TOOLBAR;
45 } 45 }
46 46
47 - (BOOL)isOpaque { 47 - (BOOL)isOpaque {
48 return YES; 48 return YES;
49 } 49 }
50 50
51 @end 51 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/themed_window.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698