Remove BubbleDelegateView ctor color arg, add simple setter/getter.

ui/views/bubble/bubble_delegate.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #define UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
 #include "ui/base/animation/animation_delegate.h"
@@ skipping 10 matching lines @@
 class BubbleFrameView;
 
 // BubbleDelegateView creates frame and client views for bubble Widgets.
 // BubbleDelegateView itself is the client's contents view.
 //
 ///////////////////////////////////////////////////////////////////////////////
 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.
   static Widget* CreateBubble(BubbleDelegateView* bubble_delegate);
 
   // WidgetDelegate overrides:
   virtual View* GetInitiallyFocusedView() OVERRIDE;
   virtual BubbleDelegateView* AsBubbleDelegate() OVERRIDE;
   virtual View* GetContentsView() OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
@@ skipping 10 matching lines @@
   }
 
   bool allow_bubble_offscreen() const { return allow_bubble_offscreen_; }
   void set_allow_bubble_offscreen(bool allow_bubble_offscreen) {
     allow_bubble_offscreen_ = allow_bubble_offscreen;
   }
 
   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(const SkColor& color) { color_ = color; }

[sky, 2011/12/07 22:12:47]

nit: make these two consistent in the type. I would be inclined to make
set_color not take a ref.

[tfarina, 2011/12/07 22:15:19]

yeah, probably it should be passed just by value as SkColor is typedefed to
uint32_t.

[msw, 2011/12/07 22:26:24]

Done.

+
   bool use_focusless() const { return use_focusless_; }
   void set_use_focusless(bool use_focusless) {
     use_focusless_ = use_focusless;
   }
 
   // Get the arrow's anchor point in screen space.
   virtual gfx::Point GetAnchorPoint();
 
   // 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();
 
   // Fade the bubble in or out via Widget transparency.
   // Fade in calls Widget::Show; fade out calls Widget::Close upon completion.
   void StartFade(bool fade_in);
 
   // Reset fade and opacity of bubble. Restore the opacity of the
   // 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;
 
   // ui::AnimationDelegate overrides:
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Perform view initialization on the contents for bubble sizing.
   virtual void Init();
@@ skipping 45 matching lines @@
   // Create a popup window for focusless bubbles on Linux/ChromeOS.
   // These bubbles are not interactive and should not gain focus.
   bool use_focusless_;
 
   DISALLOW_COPY_AND_ASSIGN(BubbleDelegateView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_BUBBLE_BUBBLE_DELEGATE_H_