diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 05:47:45 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-01 05:47:45 +0000 |
| commit | 5bf85c0f5647d79e53085c0324e3a6201f3c54cf (patch) | |
| tree | 3458a7d8715c948e15c1b7b8caab5c28110caa4c /chrome | |
| parent | c4ce488945d73a7d0ab4668e640421bb3a0367e9 (diff) | |
| download | chromium_src-5bf85c0f5647d79e53085c0324e3a6201f3c54cf.zip chromium_src-5bf85c0f5647d79e53085c0324e3a6201f3c54cf.tar.gz chromium_src-5bf85c0f5647d79e53085c0324e3a6201f3c54cf.tar.bz2 | |
Cleanup BubbleFrameView and BubbleBorder construction.
Pass custom color to BubbleBorder ctor (or SK_ColorWHITE default).
Call BubbleFrameView::SetBubbleBorder instead and remove border ctor arg.
Misc refactoring and cleanup.
TODO(followup): Update bubbles to use BubbleDelegateView where possible.
TODO(followup): Use theme colors for misc borders instead of SK_ColorWHITE.
BUG=166075
TEST=No observable changes.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12096084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
3 files changed, 7 insertions, 14 deletions
diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc index 48d169b..f0be06d 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble_views.cc @@ -121,9 +121,8 @@ FullscreenExitBubbleViews::FullscreenExitView::FullscreenExitView( message_label_(NULL), button_view_(NULL), browser_fullscreen_exit_accelerator_(accelerator) { - views::BubbleBorder* bubble_border = - new views::BubbleBorder(views::BubbleBorder::NONE, - views::BubbleBorder::SHADOW); + views::BubbleBorder* bubble_border = new views::BubbleBorder( + views::BubbleBorder::NONE, views::BubbleBorder::SHADOW, SK_ColorWHITE); set_background(new views::BubbleBackground(bubble_border)); set_border(bubble_border); set_focusable(false); diff --git a/chrome/browser/ui/views/notifications/balloon_view_views.cc b/chrome/browser/ui/views/notifications/balloon_view_views.cc index 02ccd36..7ff2ada 100644 --- a/chrome/browser/ui/views/notifications/balloon_view_views.cc +++ b/chrome/browser/ui/views/notifications/balloon_view_views.cc @@ -105,10 +105,8 @@ BalloonViewImpl::BalloonViewImpl(BalloonCollection* collection) // We're owned by Balloon and don't want to be deleted by our parent View. set_owned_by_client(); - views::BubbleBorder* bubble_border = - new views::BubbleBorder(views::BubbleBorder::FLOAT, - views::BubbleBorder::NO_SHADOW); - set_border(bubble_border); + set_border(new views::BubbleBorder(views::BubbleBorder::FLOAT, + views::BubbleBorder::NO_SHADOW, SK_ColorWHITE)); } BalloonViewImpl::~BalloonViewImpl() { diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc index a846397..e386b79 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc @@ -92,13 +92,9 @@ OmniboxPopupContentsView::OmniboxPopupContentsView( font_(font.DeriveFont(kEditFontAdjust)), ignore_mouse_drag_(false), ALLOW_THIS_IN_INITIALIZER_LIST(size_animation_(this)) { - // The following little dance is required because set_border() requires a - // pointer to a non-const object. - views::BubbleBorder* bubble_border = - new views::BubbleBorder(views::BubbleBorder::NONE, - views::BubbleBorder::NO_SHADOW); - bubble_border_ = bubble_border; - set_border(bubble_border); + bubble_border_ = new views::BubbleBorder(views::BubbleBorder::NONE, + views::BubbleBorder::NO_SHADOW, SK_ColorWHITE); + set_border(const_cast<views::BubbleBorder*>(bubble_border_)); // The contents is owned by the LocationBarView. set_owned_by_client(); } |