diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:10:10 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-14 23:10:10 +0000 |
| commit | 1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2 (patch) | |
| tree | 9f277e5e69c7b6a9586f827d425d6b66ea29d466 /ui/views/controls/tree/tree_view_views.cc | |
| parent | 84d9ab4c2dc42dd7d18672c2855c92589bf9208b (diff) | |
| download | chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.zip chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.tar.gz chromium_src-1e25fbf5e01d0ea8045c43288ee58fc7d0b3a3a2.tar.bz2 | |
Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.
BUG=103304,125844
R=ben@chromium.org
TBR=tony@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10310136
TBR=tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10387121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/tree/tree_view_views.cc')
| -rw-r--r-- | ui/views/controls/tree/tree_view_views.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/views/controls/tree/tree_view_views.cc b/ui/views/controls/tree/tree_view_views.cc index 94893d1..92a6c2b 100644 --- a/ui/views/controls/tree/tree_view_views.cc +++ b/ui/views/controls/tree/tree_view_views.cc @@ -11,10 +11,10 @@ #include "grit/ui_resources.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/native_theme/native_theme.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/image.h" +#include "ui/gfx/native_theme.h" #include "ui/gfx/skia_util.h" #include "ui/views/background.h" #include "ui/views/border.h" @@ -81,8 +81,8 @@ View* TreeView::CreateParentIfNecessary() { ScrollView* scroll_view = new ScrollView; scroll_view->SetContents(this); scroll_view->set_border(Border::CreateSolidBorder( - 1, ui::NativeTheme::instance()->GetSystemColor( - ui::NativeTheme::kColorId_UnfocusedBorderColor))); + 1, gfx::NativeTheme::instance()->GetSystemColor( + gfx::NativeTheme::kColorId_UnfocusedBorderColor))); return scroll_view; } |