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

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 2389453002: Remove IsModeMaterial checks in ui/views/ (Closed)
Patch Set: oops Created 4 years, 3 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: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index d36350e12246dc611b8de88afb5a0ec8f7d6755a..15ae4b80256476c2a32695a39ca8f6e44ef29ba4 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -12,7 +12,6 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/models/menu_model.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
@@ -798,10 +797,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
&override_foreground_color)) {
fg_color = override_foreground_color;
}
- SkColor icon_color =
- render_selection && !ui::MaterialDesignController::IsModeMaterial()
- ? fg_color
- : color_utils::DeriveDefaultIconColor(fg_color);
+ SkColor icon_color = color_utils::DeriveDefaultIconColor(fg_color);
// Render the check.
if (type_ == CHECKBOX && delegate->IsItemChecked(GetCommand())) {

Powered by Google App Engine
This is Rietveld 408576698