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

Unified Diff: ui/views/controls/label.cc

Issue 2023453002: MD links - underline to indicate focus. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix website settings 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/views/website_settings/website_settings_popup_view.cc ('k') | ui/views/controls/link.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index b75e34c87631380cf5a172531dd5a5d1bf06f49d..77123bc4fb7102fd7d5f4a7f35d2e04cab3823f9 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -19,6 +19,7 @@
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/default_style.h"
+#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/color_utils.h"
@@ -378,7 +379,7 @@ void Label::OnPaint(gfx::Canvas* canvas) {
} else {
PaintText(canvas);
}
- if (HasFocus())
+ if (HasFocus() && !ui::MaterialDesignController::IsSecondaryUiMaterial())
canvas->DrawFocusRect(GetFocusBounds());
}
« no previous file with comments | « chrome/browser/ui/views/website_settings/website_settings_popup_view.cc ('k') | ui/views/controls/link.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698