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

Unified Diff: chrome/browser/ui/libgtkui/gtk_ui.cc

Issue 2645423002: Fix gtk theme regression introduced in 477aca494328f (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/gtk_ui.cc
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.cc b/chrome/browser/ui/libgtkui/gtk_ui.cc
index 9d9bd89d9475fdde70dc610e4b1aef74992f958e..280320517c43adcb32912da80cda02251e800db8 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -687,11 +687,12 @@ std::unique_ptr<views::Border> GtkUi::CreateNativeBorder(
owning_button->GetClassName() == views::BlueButton::kViewClassName;
for (unsigned i = 0; i < arraysize(paintstate); i++) {
- if (border->PaintsButtonState(paintstate[i].focus, paintstate[i].state)) {
- std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr;
- gtk_border->SetPainter(paintstate[i].focus, paintstate[i].state,
- base::MakeUnique<GtkButtonPainter>(idr));
- }
+ std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr;
+ gtk_border->SetPainter(
+ paintstate[i].focus, paintstate[i].state,
+ border->PaintsButtonState(paintstate[i].focus, paintstate[i].state)
+ ? base::MakeUnique<GtkButtonPainter>(idr)
+ : nullptr);
}
return gtk_border;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698