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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_border.cc

Issue 145033006: views: Make View::set_border() take a scoped_ptr<>. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 6 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 | « chrome/browser/ui/libgtk2ui/gtk2_border.h ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/gtk2_border.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
index 57b6f5da5c0aa506a4d56bac684d4b3cb1d8e5d3..93c46db35f230feb6d7001b2a2c5ee91fff70df2 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
@@ -50,8 +50,8 @@ class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
private:
const Gtk2UI* gtk2_ui_;
- GtkStateType state_;
- gfx::Size size_;
+ const GtkStateType state_;
+ const gfx::Size size_;
DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
};
@@ -60,11 +60,11 @@ class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
views::CustomButton* owning_button,
- views::Border* border)
+ scoped_ptr<views::Border> border)
: gtk2_ui_(gtk2_ui),
use_gtk_(gtk2_ui_->GetUseSystemTheme()),
owning_button_(owning_button),
- border_(border) {
+ border_(border.Pass()) {
gtk2_ui_->AddGtkBorder(this);
}
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_border.h ('k') | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698