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

Unified Diff: ui/views/controls/table/table_header.cc

Issue 191723003: Nukes USE_AURA ifdefs from views (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup 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/table/table_header.cc
diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc
index c349a6ec7c76c8a5b4b50fbe449b82170979565d..9550f35b6c2092144d16eb10b1b9febe2e80fa1b 100644
--- a/ui/views/controls/table/table_header.cc
+++ b/ui/views/controls/table/table_header.cc
@@ -5,6 +5,7 @@
#include "ui/views/controls/table/table_header.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/cursor/cursor.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/text_utils.h"
#include "ui/native_theme/native_theme.h"
@@ -12,10 +13,6 @@
#include "ui/views/controls/table/table_utils.h"
#include "ui/views/controls/table/table_view.h"
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
namespace views {
namespace {
@@ -39,15 +36,6 @@ const SkColor kSeparatorColor = SkColorSetRGB(0xAA, 0xAA, 0xAA);
// Size of the sort indicator (doesn't include padding).
const int kSortIndicatorSize = 8;
-gfx::NativeCursor GetResizeCursor() {
-#if defined(USE_AURA)
- return ui::kCursorColumnResize;
-#elif defined(OS_WIN)
- static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_SIZEWE);
- return g_hand_cursor;
-#endif
-}
-
} // namespace
// static
@@ -176,7 +164,7 @@ gfx::Size TableHeader::GetPreferredSize() {
gfx::NativeCursor TableHeader::GetCursor(const ui::MouseEvent& event) {
return GetResizeColumn(GetMirroredXInView(event.x())) != -1 ?
- GetResizeCursor() : View::GetCursor(event);
+ ui::kCursorColumnResize : View::GetCursor(event);
}
bool TableHeader::OnMousePressed(const ui::MouseEvent& event) {

Powered by Google App Engine
This is Rietveld 408576698