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

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

Issue 2637383003: Change Painter factory functions to unique_ptr (Closed)
Patch Set: msw review 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
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 9c25e84dd050a1e27885731c70acb6dd99c101b5..9d9bd89d9475fdde70dc610e4b1aef74992f958e 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -687,17 +687,14 @@ std::unique_ptr<views::Border> GtkUi::CreateNativeBorder(
owning_button->GetClassName() == views::BlueButton::kViewClassName;
for (unsigned i = 0; i < arraysize(paintstate); i++) {
- views::Painter* painter = nullptr;
-
if (border->PaintsButtonState(paintstate[i].focus, paintstate[i].state)) {
std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr;
- painter = new GtkButtonPainter(idr);
+ gtk_border->SetPainter(paintstate[i].focus, paintstate[i].state,
+ base::MakeUnique<GtkButtonPainter>(idr));
}
-
- gtk_border->SetPainter(paintstate[i].focus, paintstate[i].state, painter);
}
- return std::move(gtk_border);
+ return gtk_border;
}
void GtkUi::AddWindowButtonOrderObserver(
« no previous file with comments | « ash/common/wm/workspace/phantom_window_controller.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698