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

Unified Diff: ui/views/bubble/tray_bubble_view.cc

Issue 2835233005: Revert of Introduce a type of View background that stays in sync with its host (Closed)
Patch Set: Created 3 years, 8 months 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/views/bubble/tray_bubble_view.h ('k') | ui/views/view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/tray_bubble_view.cc
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index e1cd28571acad798e53ce195d56e7f571c3e17bb..3d7a93eecae09d4b4d6f03ab71aef2e27a33c54c 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -175,7 +175,8 @@
max_width(max_width),
max_height(0),
can_activate(false),
- close_on_deactivate(true) {}
+ close_on_deactivate(true),
+ bg_color(gfx::kPlaceholderColor) {}
TrayBubbleView::InitParams::InitParams(const InitParams& other) = default;
@@ -195,14 +196,12 @@
layout_(new BottomAlignedBoxLayout(this)),
delegate_(delegate),
preferred_width_(init_params.min_width),
- bubble_border_(new BubbleBorder(
- arrow(),
- BubbleBorder::NO_ASSETS,
- init_params.bg_color.value_or(gfx::kPlaceholderColor))),
+ bubble_border_(new BubbleBorder(arrow(),
+ BubbleBorder::NO_ASSETS,
+ init_params.bg_color)),
owned_bubble_border_(bubble_border_),
is_gesture_dragging_(false),
mouse_actively_entered_(false) {
- bubble_border_->set_use_theme_background_color(!init_params.bg_color);
bubble_border_->set_alignment(BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
bubble_border_->set_paint_arrow(BubbleBorder::PAINT_NONE);
set_can_activate(params_.can_activate);
« no previous file with comments | « ui/views/bubble/tray_bubble_view.h ('k') | ui/views/view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698