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

Unified Diff: chrome/browser/ui/cocoa/background_gradient_view.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 | « no previous file | chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/background_gradient_view.mm
diff --git a/chrome/browser/ui/cocoa/background_gradient_view.mm b/chrome/browser/ui/cocoa/background_gradient_view.mm
index ed625cbd86bd10f1fa114180257af196bcfdcc66..73e068384a5f0f24ed1d3ff8683117b464c11221 100644
--- a/chrome/browser/ui/cocoa/background_gradient_view.mm
+++ b/chrome/browser/ui/cocoa/background_gradient_view.mm
@@ -10,6 +10,7 @@
#include "grit/theme_resources.h"
#import "ui/base/cocoa/nsgraphics_context_additions.h"
#import "ui/base/cocoa/nsview_additions.h"
+#include "ui/base/material_design/material_design_controller.h"
@interface BackgroundGradientView (Private)
- (void)commonInit;
@@ -94,9 +95,13 @@
const ui::ThemeProvider* themeProvider = [window themeProvider];
if (!themeProvider)
return [NSColor blackColor];
+ if (!ui::MaterialDesignController::IsModeMaterial()) {
+ return themeProvider->GetNSColor(
+ isActive ? ThemeProperties::COLOR_TOOLBAR_STROKE :
+ ThemeProperties::COLOR_TOOLBAR_STROKE_INACTIVE);
+ }
return themeProvider->GetNSColor(
- isActive ? ThemeProperties::COLOR_TOOLBAR_STROKE :
- ThemeProperties::COLOR_TOOLBAR_STROKE_INACTIVE);
+ ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR);
}
- (NSColor*)backgroundImageColor {
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698