OLD | NEW |
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 |
20 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity. | 24 // Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity. |
21 - (NSColor*)strokeColor { | 25 - (NSColor*)strokeColor { |
22 // Only return a transparent color if not Material Design. | 26 // Only return a transparent color if not Material Design. |
23 if (!ui::MaterialDesignController::IsModeMaterial()) { | 27 if (!ui::MaterialDesignController::IsModeMaterial()) { |
24 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]]; | 28 return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]]; |
25 } | 29 } |
26 return [super strokeColor]; | 30 return [super strokeColor]; |
27 } | 31 } |
28 | 32 |
29 - (BOOL)accessibilityIsIgnored { | 33 - (BOOL)accessibilityIsIgnored { |
(...skipping 16 matching lines...) Expand all Loading... |
46 } | 50 } |
47 | 51 |
48 // ThemedWindowDrawing overrides. | 52 // ThemedWindowDrawing overrides. |
49 | 53 |
50 - (void)windowDidChangeActive { | 54 - (void)windowDidChangeActive { |
51 // Need to redraw the omnibox and toolbar buttons as well. | 55 // Need to redraw the omnibox and toolbar buttons as well. |
52 [self cr_recursivelySetNeedsDisplay:YES]; | 56 [self cr_recursivelySetNeedsDisplay:YES]; |
53 } | 57 } |
54 | 58 |
55 @end | 59 @end |
OLD | NEW |