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

Unified Diff: chrome/browser/ui/views/location_bar/selected_keyword_view.cc

Issue 1448433004: [MD] update EV bubble icon and location bar https icons (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build.gn Created 5 years, 1 month 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/views/location_bar/selected_keyword_view.cc
diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
index 29ebad19b2cec2adaa5efa1083f3b2016483daa8..517a51a09bf7f1d1545f11212984f77a1d8057f8 100644
--- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
+++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc
@@ -17,6 +17,8 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/material_design/material_design_controller.h"
#include "ui/base/theme_provider.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/gfx/color_utils.h"
#include "ui/gfx/paint_vector_icon.h"
#include "ui/gfx/vector_icons_public.h"
#include "ui/native_theme/native_theme.h"
@@ -56,11 +58,15 @@ void SelectedKeywordView::ResetImage() {
}
SkColor SelectedKeywordView::GetTextColor() const {
- return GetNativeTheme()->GetSystemColor(
- ui::NativeTheme::kColorId_LinkEnabled);
+ DCHECK(ui::MaterialDesignController::IsModeMaterial());
+ return color_utils::IsDark(GetParentBackgroundColor())
+ ? gfx::kGoogleBlue700
+ : GetNativeTheme()->GetSystemColor(
+ ui::NativeTheme::kColorId_LinkEnabled);
}
SkColor SelectedKeywordView::GetBorderColor() const {
+ DCHECK(ui::MaterialDesignController::IsModeMaterial());
return GetTextColor();
}
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | components/omnibox/browser/omnibox_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698