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

Unified Diff: ash/system/tray/tray_popup_utils.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 | « ash/system/tray/tray_details_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/tray_popup_utils.cc
diff --git a/ash/system/tray/tray_popup_utils.cc b/ash/system/tray/tray_popup_utils.cc
index 39d32000d0bb4b4e99fea3986167daa68c5e87c7..d5bdd0a69e1abc1c8e05e6287ca0868c2c26de7c 100644
--- a/ash/system/tray/tray_popup_utils.cc
+++ b/ash/system/tray/tray_popup_utils.cc
@@ -21,7 +21,6 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/color_palette.h"
#include "ui/gfx/paint_vector_icon.h"
-#include "ui/native_theme/native_theme.h"
#include "ui/views/animation/flood_fill_ink_drop_ripple.h"
#include "ui/views/animation/ink_drop_highlight.h"
#include "ui/views/animation/ink_drop_impl.h"
@@ -227,8 +226,9 @@
// Frequently the label will paint to a layer that's non-opaque, so subpixel
// rendering won't work unless we explicitly set a background. See
// crbug.com/686363
- label->set_background(views::Background::CreateThemedSolidBackground(
- label, ui::NativeTheme::kColorId_BubbleBackground));
+ label->set_background(
+ views::Background::CreateSolidBackground(kBackgroundColor));
+ label->SetBackgroundColor(kBackgroundColor);
return label;
}
@@ -287,8 +287,8 @@
void TrayPopupUtils::ConfigureAsStickyHeader(views::View* view) {
view->set_id(VIEW_ID_STICKY_HEADER);
- view->set_background(views::Background::CreateThemedSolidBackground(
- view, ui::NativeTheme::kColorId_BubbleBackground));
+ view->set_background(
+ views::Background::CreateSolidBackground(kBackgroundColor));
view->SetBorder(
views::CreateEmptyBorder(gfx::Insets(kMenuSeparatorVerticalPadding, 0)));
view->SetPaintToLayer();
« no previous file with comments | « ash/system/tray/tray_details_view.cc ('k') | ash/system/tray_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698