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

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

Issue 2336453002: BackgroundGradientView: -drawBackground: → -drawRect: (Closed)
Patch Set: Put this back. Created 4 years, 3 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
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_view.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_cocoa.h" 5 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"
6 6
7 #import "chrome/browser/ui/cocoa/view_id_util.h" 7 #import "chrome/browser/ui/cocoa/view_id_util.h"
8 #import "ui/base/cocoa/nsview_additions.h" 8 #import "ui/base/cocoa/nsview_additions.h"
9 #include "ui/base/material_design/material_design_controller.h" 9 #include "ui/base/material_design/material_design_controller.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)dirtyRect {
21 [self drawBackground:dirtyRect];
22 }
23
24 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity. 20 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity.
25 - (NSColor*)strokeColor { 21 - (NSColor*)strokeColor {
26 // Only return a transparent color if not Material Design. 22 // Only return a transparent color if not Material Design.
27 if (!ui::MaterialDesignController::IsModeMaterial()) { 23 if (!ui::MaterialDesignController::IsModeMaterial()) {
28 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]]; 24 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]];
29 } 25 }
30 return [super strokeColor]; 26 return [super strokeColor];
31 } 27 }
32 28
33 - (BOOL)accessibilityIsIgnored { 29 - (BOOL)accessibilityIsIgnored {
(...skipping 16 matching lines...) Expand all
50 } 46 }
51 47
52 // ThemedWindowDrawing overrides. 48 // ThemedWindowDrawing overrides.
53 49
54 - (void)windowDidChangeActive { 50 - (void)windowDidChangeActive {
55 // Need to redraw the omnibox and toolbar buttons as well. 51 // Need to redraw the omnibox and toolbar buttons as well.
56 [self cr_recursivelySetNeedsDisplay:YES]; 52 [self cr_recursivelySetNeedsDisplay:YES];
57 } 53 }
58 54
59 @end 55 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_view.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698