Commit 440758bc authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot

Use non-deprecated color function for Exit Session background color.

Intended change:
Light mode: kGoogleRed700 -> kGoogleRed600
Dark mode: kGoogleRed700 -> kGoogleRed300

Bug: 1028245
Change-Id: Ida204c593a21f018fb39adc9091653012c1b259d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933943
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: default avatarStefan Kuhne <skuhne@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Ahmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718974}
parent a36ecd57
...@@ -26,7 +26,6 @@ constexpr SkColor kUnifiedMenuButtonColor = ...@@ -26,7 +26,6 @@ constexpr SkColor kUnifiedMenuButtonColor =
SkColorSetA(gfx::kGoogleGrey200, 0x14); SkColorSetA(gfx::kGoogleGrey200, 0x14);
constexpr SkColor kUnifiedMenuButtonColorActive = gfx::kGoogleBlueDark600; constexpr SkColor kUnifiedMenuButtonColorActive = gfx::kGoogleBlueDark600;
constexpr SkColor kProminentIconButtonColor = gfx::kGoogleGreen700; constexpr SkColor kProminentIconButtonColor = gfx::kGoogleGreen700;
constexpr SkColor kLogoutButtonTrayColor = gfx::kGoogleRed700;
//----------------------------------End---------------------------------------- //----------------------------------End----------------------------------------
......
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include "ash/shelf/shelf.h" #include "ash/shelf/shelf.h"
#include "ash/shell.h" #include "ash/shell.h"
#include "ash/style/ash_color_provider.h" #include "ash/style/ash_color_provider.h"
#include "ash/style/default_color_constants.h"
#include "ash/system/session/logout_confirmation_controller.h" #include "ash/system/session/logout_confirmation_controller.h"
#include "ash/system/status_area_widget.h" #include "ash/system/status_area_widget.h"
#include "ash/system/tray/tray_constants.h" #include "ash/system/tray/tray_constants.h"
...@@ -40,9 +39,9 @@ LogoutButtonTray::LogoutButtonTray(Shelf* shelf) : TrayBackgroundView(shelf) { ...@@ -40,9 +39,9 @@ LogoutButtonTray::LogoutButtonTray(Shelf* shelf) : TrayBackgroundView(shelf) {
auto button = views::MdTextButton::Create(this, base::string16(), auto button = views::MdTextButton::Create(this, base::string16(),
CONTEXT_LAUNCHER_BUTTON); CONTEXT_LAUNCHER_BUTTON);
button->SetProminent(true); button->SetProminent(true);
button->SetBgColorOverride( button->SetBgColorOverride(AshColorProvider::Get()->GetBaseLayerColor(
AshColorProvider::Get()->DeprecatedGetBaseLayerColor( AshColorProvider::BaseLayerType::kRed,
AshColorProvider::BaseLayerType::kRed, kLogoutButtonTrayColor)); AshColorProvider::AshColorMode::kDark));
button_ = tray_container()->AddChildView(std::move(button)); button_ = tray_container()->AddChildView(std::move(button));
} }
......
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