| Index: ui/views/corewm/tooltip_aura.cc
|
| diff --git a/ui/views/corewm/tooltip_aura.cc b/ui/views/corewm/tooltip_aura.cc
|
| index 50ced84d66dc4bbe2acfd2b7a86b4f76adc0d72a..777603cbeac70def1ed7e14d968cbbe9c6ef74a6 100644
|
| --- a/ui/views/corewm/tooltip_aura.cc
|
| +++ b/ui/views/corewm/tooltip_aura.cc
|
| @@ -12,13 +12,13 @@
|
| #include "ui/gfx/screen.h"
|
| #include "ui/gfx/text_elider.h"
|
| #include "ui/gfx/text_utils.h"
|
| +#include "ui/native_theme/native_theme.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/border.h"
|
| #include "ui/views/widget/widget.h"
|
|
|
| namespace {
|
|
|
| -const SkColor kTooltipBackground = 0xFFFFFFCC;
|
| const int kTooltipHorizontalPadding = 3;
|
|
|
| // Max visual tooltip width. If a tooltip is greater than this width, it will
|
| @@ -60,8 +60,6 @@ TooltipAura::TooltipAura(gfx::ScreenType screen_type)
|
| : screen_type_(screen_type),
|
| widget_(NULL),
|
| tooltip_window_(NULL) {
|
| - label_.set_background(
|
| - views::Background::CreateSolidBackground(kTooltipBackground));
|
| label_.set_owned_by_client();
|
| label_.SetMultiLine(true);
|
| }
|
| @@ -234,6 +232,11 @@ void TooltipAura::SetText(aura::Window* window,
|
| 2 * kTooltipVerticalPadding;
|
| CreateWidget();
|
| SetTooltipBounds(location, width, height);
|
| +
|
| + label_.set_background(
|
| + views::Background::CreateSolidBackground(
|
| + widget_->GetNativeTheme()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_TooltipBackground)));
|
| }
|
|
|
| void TooltipAura::Show() {
|
|
|