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

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

Issue 10387121: Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/combobox/native_combobox_win.cc ('k') | ui/views/controls/label.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/focusable_border.cc
===================================================================
--- ui/views/controls/focusable_border.cc (revision 137002)
+++ ui/views/controls/focusable_border.cc (working copy)
@@ -4,9 +4,9 @@
#include "ui/views/controls/focusable_border.h"
-#include "ui/base/native_theme/native_theme.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/insets.h"
+#include "ui/gfx/native_theme.h"
#include "ui/gfx/skia_util.h"
namespace {
@@ -32,9 +32,9 @@
path.addRect(gfx::RectToSkRect(view.GetLocalBounds()), SkPath::kCW_Direction);
SkPaint paint;
paint.setStyle(SkPaint::kStroke_Style);
- SkColor focus_color = ui::NativeTheme::instance()->GetSystemColor(
- has_focus_ ? ui::NativeTheme::kColorId_FocusedBorderColor
- : ui::NativeTheme::kColorId_UnfocusedBorderColor);
+ SkColor focus_color = gfx::NativeTheme::instance()->GetSystemColor(
+ has_focus_ ? gfx::NativeTheme::kColorId_FocusedBorderColor
+ : gfx::NativeTheme::kColorId_UnfocusedBorderColor);
paint.setColor(focus_color);
paint.setStrokeWidth(SkIntToScalar(2));
« no previous file with comments | « ui/views/controls/combobox/native_combobox_win.cc ('k') | ui/views/controls/label.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698