| Index: ui/views/bubble/bubble_delegate.cc
|
| diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
|
| index fa3a7b92118d9ca494d297de61059962a4b18c47..12c3798185a9d7a4a101c7b045c09c5d87023359 100644
|
| --- a/ui/views/bubble/bubble_delegate.cc
|
| +++ b/ui/views/bubble/bubble_delegate.cc
|
| @@ -111,13 +111,14 @@ BubbleDelegateView::BubbleDelegateView()
|
| anchor_widget_(NULL),
|
| move_with_anchor_(false),
|
| arrow_location_(BubbleBorder::TOP_LEFT),
|
| + shadow_(BubbleBorder::NO_SHADOW),
|
| color_(kBackgroundColor),
|
| margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
|
| original_opacity_(255),
|
| border_widget_(NULL),
|
| use_focusless_(false),
|
| accept_events_(true),
|
| - try_mirroring_arrow_(true),
|
| + adjust_if_offscreen_(true),
|
| parent_window_(NULL) {
|
| set_background(Background::CreateSolidBackground(color_));
|
| AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
|
| @@ -132,13 +133,14 @@ BubbleDelegateView::BubbleDelegateView(
|
| anchor_widget_(NULL),
|
| move_with_anchor_(false),
|
| arrow_location_(arrow_location),
|
| + shadow_(BubbleBorder::NO_SHADOW),
|
| color_(kBackgroundColor),
|
| margins_(kDefaultMargin, kDefaultMargin, kDefaultMargin, kDefaultMargin),
|
| original_opacity_(255),
|
| border_widget_(NULL),
|
| use_focusless_(false),
|
| accept_events_(true),
|
| - try_mirroring_arrow_(true),
|
| + adjust_if_offscreen_(true),
|
| parent_window_(NULL) {
|
| set_background(Background::CreateSolidBackground(color_));
|
| AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
|
| @@ -194,9 +196,7 @@ NonClientFrameView* BubbleDelegateView::CreateNonClientFrameView(
|
| BubbleBorder::ArrowLocation arrow_loc = arrow_location();
|
| if (base::i18n::IsRTL())
|
| arrow_loc = BubbleBorder::horizontal_mirror(arrow_loc);
|
| - // TODO(alicet): Expose the shadow option in BorderContentsView when we make
|
| - // the fullscreen exit bubble use the new bubble code.
|
| - BubbleBorder* border = new BubbleBorder(arrow_loc, BubbleBorder::NO_SHADOW);
|
| + BubbleBorder* border = new BubbleBorder(arrow_loc, shadow_);
|
| border->set_background_color(color());
|
| BubbleFrameView* frame_view = new BubbleFrameView(margins(), border);
|
| frame_view->set_background(new BubbleBackground(border));
|
| @@ -350,7 +350,7 @@ gfx::Rect BubbleDelegateView::GetBubbleBounds() {
|
| // The argument rect has its origin at the bubble's arrow anchor point;
|
| // its size is the preferred size of the bubble's client view (this view).
|
| return GetBubbleFrameView()->GetUpdatedWindowBounds(GetAnchorRect(),
|
| - GetPreferredSize(), try_mirroring_arrow_);
|
| + GetPreferredSize(), adjust_if_offscreen_);
|
| }
|
|
|
| #if defined(OS_WIN) && !defined(USE_AURA)
|
|
|