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

Unified Diff: ui/views/controls/label.cc

Issue 10310136: ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win Created 8 years, 7 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 | « ui/views/controls/focusable_border.cc ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ui/views/controls/focusable_border.cc ('k') | ui/views/controls/menu/menu_config_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698