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

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

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: incorporate feedback Created 6 years, 9 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
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..6c2f20cb2bd1008d3b72f5fc7026af0a537f6e3b 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";
@@ -33,14 +30,7 @@ const char* ResizeArea::GetClassName() const {
}
gfx::NativeCursor ResizeArea::GetCursor(const ui::MouseEvent& event) {
- if (!enabled())
- 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
+ return enabled() ? ui::kCursorEastWestResize : gfx::kNullCursor;
}
bool ResizeArea::OnMousePressed(const ui::MouseEvent& event) {
« no previous file with comments | « ui/views/controls/native/native_view_host_unittest.cc ('k') | ui/views/controls/scrollbar/base_scroll_bar_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698