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

Unified Diff: ui/native_theme/native_theme_mac.mm

Issue 2241293003: [MD User Menu] Adjusted its background color (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Break in win Created 4 years, 4 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 | ui/native_theme/native_theme_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/native_theme_mac.mm
diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm
index 4b34bf7d12c77bb43e634f19c66017de978d07bb..e08aded6500a14566452e82ddc42fadbc0d0e3a4 100644
--- a/ui/native_theme/native_theme_mac.mm
+++ b/ui/native_theme/native_theme_mac.mm
@@ -15,6 +15,7 @@
#include "third_party/skia/include/core/SkDrawLooper.h"
#include "third_party/skia/include/core/SkRRect.h"
#include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/base/material_design/material_design_controller.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/shadow_value.h"
@@ -113,7 +114,9 @@ SkColor NativeThemeMac::GetSystemColor(ColorId color_id) const {
case kColorId_WindowBackground:
return NSSystemColorToSkColor([NSColor windowBackgroundColor]);
case kColorId_DialogBackground:
- return kDialogBackgroundColor;
+ return ui::MaterialDesignController::IsSecondaryUiMaterial()
+ ? GetAuraColor(color_id, this)
+ : kDialogBackgroundColor;
case kColorId_BubbleBackground:
return SK_ColorWHITE;
« no previous file with comments | « no previous file | ui/native_theme/native_theme_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698