| Index: ui/views/controls/label.cc
|
| diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
|
| index ac40fe5827c4f92f078ba2bb9246a6dcc1d02e0d..21bf14d7a74d41a6fff6a8ac5ab98107e4b64726 100644
|
| --- a/ui/views/controls/label.cc
|
| +++ b/ui/views/controls/label.cc
|
| @@ -21,7 +21,7 @@
|
| #include "ui/gfx/color_utils.h"
|
| #include "ui/gfx/font.h"
|
| #include "ui/gfx/insets.h"
|
| -#include "ui/gfx/native_theme.h"
|
| +#include "ui/base/native_theme/native_theme.h"
|
| #include "ui/views/background.h"
|
|
|
| namespace views {
|
| @@ -359,12 +359,12 @@ void Label::Init(const string16& text, const gfx::Font& font) {
|
| contains_mouse_ = false;
|
| font_ = font;
|
| text_size_valid_ = false;
|
| - requested_enabled_color_ = gfx::NativeTheme::instance()->GetSystemColor(
|
| - gfx::NativeTheme::kColorId_LabelEnabledColor);
|
| - requested_disabled_color_ = gfx::NativeTheme::instance()->GetSystemColor(
|
| - gfx::NativeTheme::kColorId_LabelDisabledColor);
|
| - background_color_ = gfx::NativeTheme::instance()->GetSystemColor(
|
| - gfx::NativeTheme::kColorId_LabelBackgroundColor);
|
| + requested_enabled_color_ = ui::NativeTheme::instance()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_LabelEnabledColor);
|
| + requested_disabled_color_ = ui::NativeTheme::instance()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_LabelDisabledColor);
|
| + background_color_ = ui::NativeTheme::instance()->GetSystemColor(
|
| + ui::NativeTheme::kColorId_LabelBackgroundColor);
|
| auto_color_readability_ = true;
|
| RecalculateColors();
|
| horiz_alignment_ = ALIGN_CENTER;
|
|
|