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

Unified Diff: components/infobars/core/infobar_delegate.cc

Issue 2361843003: Always use vector icons for desktop infobars (when one is defined). (Closed)
Patch Set: make patch match description 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: components/infobars/core/infobar_delegate.cc
diff --git a/components/infobars/core/infobar_delegate.cc b/components/infobars/core/infobar_delegate.cc
index 849811e051012c5c5bff6f29d078eb1a4097ebd8..dcb70f59090f80b5419461843378018939bcef61 100644
--- a/components/infobars/core/infobar_delegate.cc
+++ b/components/infobars/core/infobar_delegate.cc
@@ -43,14 +43,12 @@ gfx::VectorIconId InfoBarDelegate::GetVectorIconId() const {
gfx::Image InfoBarDelegate::GetIcon() const {
#if !defined(OS_IOS) && !defined(OS_ANDROID)
- if (ui::MaterialDesignController::IsModeMaterial()) {
- gfx::VectorIconId vector_id = GetVectorIconId();
- if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
- return gfx::Image(gfx::CreateVectorIcon(vector_id, 16,
- GetInfoBarType() == WARNING_TYPE
- ? SkColorSetRGB(0xFF, 0x67, 0)
- : gfx::kGoogleBlue500));
- }
+ gfx::VectorIconId vector_id = GetVectorIconId();
+ if (vector_id != gfx::VectorIconId::VECTOR_ICON_NONE) {
+ return gfx::Image(gfx::CreateVectorIcon(vector_id, 16,
+ GetInfoBarType() == WARNING_TYPE
+ ? SkColorSetRGB(0xFF, 0x67, 0)
+ : gfx::kGoogleBlue500));
}
#endif
« chrome/browser/ssl/ssl_add_certificate.cc ('K') | « chrome/browser/ssl/ssl_add_certificate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698