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

Unified Diff: ui/views/bubble/bubble_delegate.h

Issue 8833004: Remove BubbleDelegateView ctor color arg, add simple setter/getter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pass set_color SkColor arg by value. Created 9 years 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/aura_shell/examples/bubble.cc ('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/bubble/bubble_delegate.h
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index 0e7da9ba627f7395f0118a24f5fd69c03539ac32..3211a3e9863c28bd290962c33b28635591da4a27 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -28,10 +28,12 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
public ui::AnimationDelegate,
public Widget::Observer {
public:
+ // The default bubble background color.
+ static const SkColor kBackgroundColor;
+
BubbleDelegateView();
BubbleDelegateView(View* anchor_view,
- BubbleBorder::ArrowLocation arrow_location,
- const SkColor& color);
+ BubbleBorder::ArrowLocation arrow_location);
virtual ~BubbleDelegateView();
// Create and initialize the bubble Widget(s) with proper bounds.
@@ -62,6 +64,9 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
View* anchor_view() const { return anchor_view_; }
void set_anchor_view(View* anchor_view) { anchor_view_ = anchor_view; }
+ SkColor color() const { return color_; }
+ void set_color(SkColor color) { color_ = color; }
+
bool use_focusless() const { return use_focusless_; }
void set_use_focusless(bool use_focusless) {
use_focusless_ = use_focusless;
@@ -73,9 +78,6 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
// Get the arrow's location on the bubble.
virtual BubbleBorder::ArrowLocation GetArrowLocation() const;
- // Get the color used for the background and border.
- virtual SkColor GetColor() const;
-
// Show the bubble's widget (and |border_widget_| on Windows).
void Show();
@@ -87,9 +89,6 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
// bubble to the setting before StartFade() was called.
void ResetFade();
- // The default bubble background color.
- static const SkColor kBackgroundColor;
-
protected:
// View overrides:
virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
« no previous file with comments | « ui/aura_shell/examples/bubble.cc ('k') | ui/views/bubble/bubble_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698