Chromium Code Reviews| Index: ui/views/controls/resize_area.cc |
| diff --git a/ui/views/controls/resize_area.cc b/ui/views/controls/resize_area.cc |
| index cc7edda564be5d3ed590ed323d9db80e1eb4d98c..75d93eb25984427d40a739f1634351efd9cc58e4 100644 |
| --- a/ui/views/controls/resize_area.cc |
| +++ b/ui/views/controls/resize_area.cc |
| @@ -6,13 +6,10 @@ |
| #include "base/logging.h" |
| #include "ui/accessibility/ax_view_state.h" |
| +#include "ui/base/cursor/cursor.h" |
| #include "ui/base/resource/resource_bundle.h" |
| #include "ui/views/controls/resize_area_delegate.h" |
| -#if defined(USE_AURA) |
| -#include "ui/base/cursor/cursor.h" |
| -#endif |
| - |
| namespace views { |
| const char ResizeArea::kViewClassName[] = "ResizeArea"; |
| @@ -35,12 +32,7 @@ const char* ResizeArea::GetClassName() const { |
| gfx::NativeCursor ResizeArea::GetCursor(const ui::MouseEvent& event) { |
| if (!enabled()) |
|
msw
2014/03/08 01:04:50
nit: return enabled() ? ui::kCursorEastWestResize
sky
2014/03/08 01:30:28
Done.
|
| return gfx::kNullCursor; |
| -#if defined(USE_AURA) |
| return ui::kCursorEastWestResize; |
| -#elif defined(OS_WIN) |
| - static HCURSOR g_resize_cursor = LoadCursor(NULL, IDC_SIZEWE); |
| - return g_resize_cursor; |
| -#endif |
| } |
| bool ResizeArea::OnMousePressed(const ui::MouseEvent& event) { |