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

Unified Diff: ui/views/border.h

Issue 2480813003: Reduce views::Border creation verbosity by promoting factory functions (Closed)
Patch Set: fix bad merge Created 4 years, 1 month 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/message_center/views/notifier_settings_view.cc ('k') | ui/views/border.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/border.h
diff --git a/ui/views/border.h b/ui/views/border.h
index 8bceb65c8ff15839a378d6a4818208d4f2dd8614..2204b90a149c6be0ae4877ec50fd92834d10f122 100644
--- a/ui/views/border.h
+++ b/ui/views/border.h
@@ -28,7 +28,7 @@ class View;
//
// The border class is used to display a border around a view.
// To set a border on a view, just call SetBorder on the view, for example:
-// view->SetBorder(Border::CreateSolidBorder(1, SkColorSetRGB(25, 25, 112));
+// view->SetBorder(CreateSolidBorder(1, SkColorSetRGB(25, 25, 112));
// Once set on a view, the border is owned by the view.
//
// IMPORTANT NOTE: not all views support borders at this point. In order to
@@ -43,56 +43,6 @@ class VIEWS_EXPORT Border {
Border();
virtual ~Border();
- // Convenience for creating a scoped_ptr with no Border.
- static std::unique_ptr<Border> NullBorder();
-
- // Creates a border that is a simple line of the specified thickness and
- // color.
- static std::unique_ptr<Border> CreateSolidBorder(int thickness,
- SkColor color);
-
- // Creates a border that is a rounded rectangle of the specified thickness and
- // color.
- static std::unique_ptr<Border> CreateRoundedRectBorder(int thickness,
- int corner_radius,
- SkColor color);
-
- // Creates a border for reserving space. The returned border does not
- // paint anything.
- static std::unique_ptr<Border> CreateEmptyBorder(const gfx::Insets& insets);
- static std::unique_ptr<Border> CreateEmptyBorder(int top,
- int left,
- int bottom,
- int right);
-
- // Creates a border of the specified color, and specified thickness on each
- // side.
- static std::unique_ptr<Border> CreateSolidSidedBorder(int top,
- int left,
- int bottom,
- int right,
- SkColor color);
-
- // Creates a new border that draws |border| and adds additional padding. This
- // is equivalent to changing the insets of |border| without changing how or
- // what it paints. Example:
- //
- // view->SetBorder(Border::CreatePaddedBorder(
- // Border::CreateSolidBorder(1, SK_ColorRED),
- // gfx::Insets(2, 0, 0, 0)));
- //
- // yields a single dip red border and an additional 2dip of unpainted padding
- // above the view content (below the border).
- static std::unique_ptr<Border> CreatePaddedBorder(
- std::unique_ptr<Border> border,
- const gfx::Insets& insets);
-
- // Creates a Border from the specified Painter.
- // |insets| define size of an area allocated for a Border.
- static std::unique_ptr<Border> CreateBorderPainter(
- std::unique_ptr<Painter> painter,
- const gfx::Insets& insets);
-
// Renders the border for the specified view.
virtual void Paint(const View& view, gfx::Canvas* canvas) = 0;
@@ -111,6 +61,55 @@ class VIEWS_EXPORT Border {
DISALLOW_COPY_AND_ASSIGN(Border);
};
+// Convenience for creating a scoped_ptr with no Border.
+VIEWS_EXPORT std::unique_ptr<Border> NullBorder();
+
+// Creates a border that is a simple line of the specified thickness and color.
+VIEWS_EXPORT std::unique_ptr<Border> CreateSolidBorder(int thickness,
+ SkColor color);
+
+// Creates a border that is a rounded rectangle of the specified thickness and
+// color.
+VIEWS_EXPORT std::unique_ptr<Border> CreateRoundedRectBorder(int thickness,
+ int corner_radius,
+ SkColor color);
+
+// Creates a border for reserving space. The returned border does not paint
+// anything.
+VIEWS_EXPORT std::unique_ptr<Border> CreateEmptyBorder(
+ const gfx::Insets& insets);
+VIEWS_EXPORT std::unique_ptr<Border> CreateEmptyBorder(int top,
+ int left,
+ int bottom,
+ int right);
+
+// Creates a border of the specified color, and specified thickness on each
+// side.
+VIEWS_EXPORT std::unique_ptr<Border> CreateSolidSidedBorder(int top,
+ int left,
+ int bottom,
+ int right,
+ SkColor color);
+
+// Creates a new border that draws |border| and adds additional padding. This is
+// equivalent to changing the insets of |border| without changing how or what it
+// paints. Example:
+//
+// view->SetBorder(CreatePaddedBorder(CreateSolidBorder(1, SK_ColorRED),
+// gfx::Insets(2, 0, 0, 0)));
+//
+// yields a single dip red border and an additional 2dip of unpainted padding
+// above the view content (below the border).
+VIEWS_EXPORT std::unique_ptr<Border> CreatePaddedBorder(
+ std::unique_ptr<Border> border,
+ const gfx::Insets& insets);
+
+// Creates a Border from the specified Painter. |insets| define size of an area
+// allocated for a Border.
+VIEWS_EXPORT std::unique_ptr<Border> CreateBorderPainter(
+ std::unique_ptr<Painter> painter,
+ const gfx::Insets& insets);
+
} // namespace views
#endif // UI_VIEWS_BORDER_H_
« no previous file with comments | « ui/message_center/views/notifier_settings_view.cc ('k') | ui/views/border.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698