Commit 06e4c0d1 authored by minch's avatar minch Committed by Commit Bot

dark_mode: Remove kEnableBackgroundBlur check for power menu and toast.

Background blur has been set for power menu and system toast by default,
remove flag kEnableBackgroundBlur checking for them.

Bug: 1130618
Change-Id: Ibd15ebd10369f605bac4ff123496a3777171ecbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2422351Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Min Chen <minch@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809121}
parent d5b88d13
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "ash/display/screen_orientation_controller.h" #include "ash/display/screen_orientation_controller.h"
#include "ash/login/login_screen_controller.h" #include "ash/login/login_screen_controller.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/public/cpp/new_window_delegate.h" #include "ash/public/cpp/new_window_delegate.h"
#include "ash/resources/vector_icons/vector_icons.h" #include "ash/resources/vector_icons/vector_icons.h"
#include "ash/session/session_controller_impl.h" #include "ash/session/session_controller_impl.h"
...@@ -54,9 +53,7 @@ PowerButtonMenuView::PowerButtonMenuView( ...@@ -54,9 +53,7 @@ PowerButtonMenuView::PowerButtonMenuView(
SetPaintToLayer(); SetPaintToLayer();
SetBackground( SetBackground(
views::CreateSolidBackground(AshColorProvider::Get()->GetBaseLayerColor( views::CreateSolidBackground(AshColorProvider::Get()->GetBaseLayerColor(
features::IsBackgroundBlurEnabled() AshColorProvider::BaseLayerType::kTransparent80)));
? AshColorProvider::BaseLayerType::kTransparent80
: AshColorProvider::BaseLayerType::kTransparent90)));
layer()->SetFillsBoundsOpaquely(false); layer()->SetFillsBoundsOpaquely(false);
layer()->SetRoundedCornerRadius(kMenuViewRoundRectRadiusDp); layer()->SetRoundedCornerRadius(kMenuViewRoundRectRadiusDp);
layer()->SetBackgroundBlur( layer()->SetBackgroundBlur(
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "ash/system/toast/toast_overlay.h" #include "ash/system/toast/toast_overlay.h"
#include "ash/keyboard/ui/keyboard_ui_controller.h" #include "ash/keyboard/ui/keyboard_ui_controller.h"
#include "ash/public/cpp/ash_features.h"
#include "ash/public/cpp/ash_typography.h" #include "ash/public/cpp/ash_typography.h"
#include "ash/public/cpp/shell_window_ids.h" #include "ash/public/cpp/shell_window_ids.h"
#include "ash/root_window_controller.h" #include "ash/root_window_controller.h"
...@@ -160,9 +159,7 @@ class ToastOverlayView : public views::View, public views::ButtonListener { ...@@ -160,9 +159,7 @@ class ToastOverlayView : public views::View, public views::ButtonListener {
: overlay_(overlay) { : overlay_(overlay) {
SetPaintToLayer(); SetPaintToLayer();
background_color_ = AshColorProvider::Get()->GetBaseLayerColor( background_color_ = AshColorProvider::Get()->GetBaseLayerColor(
features::IsBackgroundBlurEnabled() AshColorProvider::BaseLayerType::kTransparent80);
? AshColorProvider::BaseLayerType::kTransparent80
: AshColorProvider::BaseLayerType::kTransparent90);
SetBackground(views::CreateSolidBackground(background_color_)); SetBackground(views::CreateSolidBackground(background_color_));
layer()->SetFillsBoundsOpaquely(false); layer()->SetFillsBoundsOpaquely(false);
layer()->SetRoundedCornerRadius(gfx::RoundedCornersF(kToastCornerRounding)); layer()->SetRoundedCornerRadius(gfx::RoundedCornersF(kToastCornerRounding));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment