| 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();
|
|
|