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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm

Issue 1950703002: [Mac][Material Design] Update toolbar bottom border color. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code cleanup. Created 4 years, 7 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
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm
index 049e53c1bc3292db8e57609b2707dcb77d966504..82283f02d9843fbb61f895f78bd0ff85d6c96d98 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm
@@ -6,6 +6,7 @@
#import "chrome/browser/ui/cocoa/view_id_util.h"
#import "ui/base/cocoa/nsview_additions.h"
+#include "ui/base/material_design/material_design_controller.h"
@implementation ToolbarView
@@ -22,7 +23,11 @@
// Override of |-[BackgroundGradientView strokeColor]|; make it respect opacity.
- (NSColor*)strokeColor {
- return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]];
+ // Only return a transparent color if not Material Design.
+ if (!ui::MaterialDesignController::IsModeMaterial()) {
+ return [[super strokeColor] colorWithAlphaComponent:[self dividerOpacity]];
+ }
+ return [super strokeColor];
}
- (BOOL)accessibilityIsIgnored {
« no previous file with comments | « chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698