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

Unified Diff: components/infobars/core/infobar.cc

Issue 2473863004: Remove MaterialDesignController::IsModeMaterial (Closed)
Patch Set: pkasting review and rebase Created 4 years, 1 month 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 | « components/infobars/core/infobar.h ('k') | ui/base/material_design/material_design_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/infobars/core/infobar.cc
diff --git a/components/infobars/core/infobar.cc b/components/infobars/core/infobar.cc
index f71717403070d1387d216b1a3be104f88a52f981..e25a8ea1ba4afd2f595194ec1ad29fe8e304aa25 100644
--- a/components/infobars/core/infobar.cc
+++ b/components/infobars/core/infobar.cc
@@ -11,7 +11,6 @@
#include "build/build_config.h"
#include "components/infobars/core/infobar_container.h"
#include "components/infobars/core/infobar_manager.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/gfx/animation/slide_animation.h"
namespace infobars {
@@ -36,36 +35,14 @@ InfoBar::~InfoBar() {
}
// static
-SkColor InfoBar::GetTopColor(InfoBarDelegate::Type infobar_type) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- static const SkColor kWarningBackgroundColorMd =
- SkColorSetRGB(0xFF, 0xEC, 0xB3); // Yellow
- static const SkColor kPageActionBackgroundColorMd = SK_ColorWHITE;
-
- return infobar_type == InfoBarDelegate::WARNING_TYPE ?
- kWarningBackgroundColorMd : kPageActionBackgroundColorMd;
- }
-
- static const SkColor kWarningBackgroundColorTop =
- SkColorSetRGB(255, 242, 183); // Yellow
- static const SkColor kPageActionBackgroundColorTop =
- SkColorSetRGB(237, 237, 237); // Gray
- return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
- kWarningBackgroundColorTop : kPageActionBackgroundColorTop;
-}
-
-// static
-SkColor InfoBar::GetBottomColor(InfoBarDelegate::Type infobar_type) {
- // No gradient in MD.
- if (ui::MaterialDesignController::IsModeMaterial())
- return GetTopColor(infobar_type);
-
- static const SkColor kWarningBackgroundColorBottom =
- SkColorSetRGB(250, 230, 145); // Yellow
- static const SkColor kPageActionBackgroundColorBottom =
- SkColorSetRGB(217, 217, 217); // Gray
- return (infobar_type == InfoBarDelegate::WARNING_TYPE) ?
- kWarningBackgroundColorBottom : kPageActionBackgroundColorBottom;
+SkColor InfoBar::GetBackgroundColor(InfoBarDelegate::Type infobar_type) {
+ static const SkColor kWarningBackgroundColor =
+ SkColorSetRGB(0xFF, 0xEC, 0xB3); // Yellow
+ static constexpr SkColor kPageActionBackgroundColor = SK_ColorWHITE;
+
+ return infobar_type == InfoBarDelegate::WARNING_TYPE
+ ? kWarningBackgroundColor
+ : kPageActionBackgroundColor;
}
void InfoBar::SetOwner(InfoBarManager* owner) {
« no previous file with comments | « components/infobars/core/infobar.h ('k') | ui/base/material_design/material_design_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698