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

Unified Diff: chrome/browser/ui/views/infobars/infobar_view.cc

Issue 2305933002: Update dialog close buttons to use vector icons and ripples. (Closed)
Patch Set: always good to compile 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
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.h ('k') | chrome/browser/ui/views/toolbar/reload_button.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/infobar_view.cc
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index da8b219638b5d817e624b542201c5e7607d850d6..be24e13ced9cfdcaf989429b73f5cd2ebe73bc3b 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -11,7 +11,6 @@
#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/ui/infobar_container_delegate.h"
-#include "chrome/browser/ui/views/bar_control_button.h"
#include "chrome/browser/ui/views/infobars/infobar_background.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/theme_resources.h"
@@ -35,6 +34,7 @@
#include "ui/views/controls/button/label_button_border.h"
#include "ui/views/controls/button/md_text_button.h"
#include "ui/views/controls/button/menu_button.h"
+#include "ui/views/controls/button/vector_icon_button.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/controls/label.h"
#include "ui/views/controls/link.h"
@@ -263,9 +263,8 @@ void InfoBarView::ViewHierarchyChanged(
}
if (ui::MaterialDesignController::IsModeMaterial()) {
- BarControlButton* close = new BarControlButton(this);
- close->SetIcon(gfx::VectorIconId::BAR_CLOSE,
- base::Bind(&GetInfobarTextColor));
+ views::VectorIconButton* close = new views::VectorIconButton(this);
+ close->SetIcon(gfx::VectorIconId::BAR_CLOSE);
close_button_ = close;
} else {
close_button_ = new views::ImageButton(this);
@@ -308,6 +307,10 @@ void InfoBarView::ButtonPressed(views::Button* sender,
}
}
+SkColor InfoBarView::GetVectorIconBaseColor() const {
+ return GetInfobarTextColor();
+}
+
int InfoBarView::ContentMinimumWidth() const {
return 0;
}
« no previous file with comments | « chrome/browser/ui/views/infobars/infobar_view.h ('k') | chrome/browser/ui/views/toolbar/reload_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698