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

Unified Diff: chrome/browser/ui/cocoa/download/download_shelf_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
Index: chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
index 6230b1e655217c1aa6df014318fa1b3f85c1e0c7..8d1940e841283b951d382f0fba05c25dba571b5f 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_view_cocoa.mm
@@ -9,6 +9,7 @@
#import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
#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 DownloadShelfView
@@ -29,12 +30,18 @@
}
- (NSColor*)strokeColor {
- BOOL isActive = [[self window] isMainWindow];
const ui::ThemeProvider* themeProvider = [[self window] themeProvider];
- return themeProvider ? themeProvider->GetNSColor(
- isActive ? ThemeProperties::COLOR_TOOLBAR_STROKE :
- ThemeProperties::COLOR_TOOLBAR_STROKE_INACTIVE) :
- [NSColor blackColor];
+ if (!themeProvider) {
+ return [NSColor blackColor];
+ }
+ if (!ui::MaterialDesignController::IsModeMaterial()) {
+ BOOL isActive = [[self window] isMainWindow];
+ return themeProvider->GetNSColor(
+ isActive ? ThemeProperties::COLOR_TOOLBAR_STROKE :
+ ThemeProperties::COLOR_TOOLBAR_STROKE_INACTIVE);
+ }
+ return themeProvider->GetNSColor(
+ ThemeProperties::COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR);
}
- (NSPoint)patternPhase {
« no previous file with comments | « chrome/browser/ui/cocoa/background_gradient_view.mm ('k') | chrome/browser/ui/cocoa/infobars/infobar_gradient_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698