[Media Notification] Remove uses of value_or
value_or seems to be causing a crash when we call
UpdateForegroundColor. If we remove them then this
should fix the crash.
BUG=974866
Change-Id: Iead32cb863ae28fe10cb66552edc89af74ca0cbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1664635
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Commit-Queue: Tommy Steimel <steimel@chromium.org>
Auto-Submit: Becca Hughes <beccahughes@chromium.org>
Reviewed-by: Tommy Steimel <steimel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#670125}
diff --git a/components/media_message_center/media_notification_background.cc b/components/media_message_center/media_notification_background.cc
index 8c736c7..3d6f49f33 100644
--- a/components/media_message_center/media_notification_background.cc
+++ b/components/media_message_center/media_notification_background.cc
@@ -339,12 +339,17 @@
}
SkColor MediaNotificationBackground::GetBackgroundColor() const {
- return background_color_.value_or(kMediaNotificationDefaultBackgroundColor);
+ if (background_color_.has_value())
+ return *background_color_;
+ return kMediaNotificationDefaultBackgroundColor;
}
SkColor MediaNotificationBackground::GetForegroundColor() const {
- const SkColor foreground = foreground_color_.value_or(views::style::GetColor(
- *owner_, views::style::CONTEXT_LABEL, views::style::STYLE_PRIMARY));
+ const SkColor foreground =
+ foreground_color_.has_value()
+ ? *foreground_color_
+ : views::style::GetColor(*owner_, views::style::CONTEXT_LABEL,
+ views::style::STYLE_PRIMARY);
return color_utils::BlendForMinContrast(foreground, GetBackgroundColor())
.color;
}