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

Unified Diff: ui/views/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 | « ui/views/border.h ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/border.cc
diff --git a/ui/views/border.cc b/ui/views/border.cc
index f347c2a83696550ecccdef3f18c38a9ba9cbf102..658a1f1c4091de2711995c0a464cd8623877f3ca 100644
--- a/ui/views/border.cc
+++ b/ui/views/border.cc
@@ -133,28 +133,37 @@ Border::~Border() {
}
// static
-Border* Border::CreateSolidBorder(int thickness, SkColor color) {
- return new SolidBorder(thickness, color);
+scoped_ptr<Border> Border::NullBorder() {
+ return scoped_ptr<Border>();
}
// static
-Border* Border::CreateEmptyBorder(int top, int left, int bottom, int right) {
- return new EmptyBorder(top, left, bottom, right);
+scoped_ptr<Border> Border::CreateSolidBorder(int thickness, SkColor color) {
+ return scoped_ptr<Border>(new SolidBorder(thickness, color));
}
// static
-Border* Border::CreateSolidSidedBorder(int top,
- int left,
- int bottom,
- int right,
- SkColor color) {
- return new SidedSolidBorder(top, left, bottom, right, color);
+scoped_ptr<Border> Border::CreateEmptyBorder(int top,
+ int left,
+ int bottom,
+ int right) {
+ return scoped_ptr<Border>(new EmptyBorder(top, left, bottom, right));
}
// static
-Border* Border::CreateBorderPainter(Painter* painter,
- const gfx::Insets& insets) {
- return new BorderPainter(painter, insets);
+scoped_ptr<Border> Border::CreateSolidSidedBorder(int top,
+ int left,
+ int bottom,
+ int right,
+ SkColor color) {
+ return scoped_ptr<Border>(
+ new SidedSolidBorder(top, left, bottom, right, color));
+}
+
+// static
+scoped_ptr<Border> Border::CreateBorderPainter(Painter* painter,
+ const gfx::Insets& insets) {
+ return scoped_ptr<Border>(new BorderPainter(painter, insets));
}
TextButtonBorder* Border::AsTextButtonBorder() {
« no previous file with comments | « ui/views/border.h ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698