Nukes USE_AURA ifdefs from views

ui/views/controls/table/table_header.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "ui/views/background.h"
 #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 {
 
 const int kVerticalPadding = 4;
 
 // The minimum width we allow a column to go down to.
 const int kMinColumnWidth = 10;
 
 // Distace from edge columns can be resized by.
 const int kResizePadding = 5;
 
 // Amount of space above/below the separator.
 const int kSeparatorPadding = 4;
 
 const SkColor kTextColor = SK_ColorBLACK;
 const SkColor kBackgroundColor1 = SkColorSetRGB(0xF9, 0xF9, 0xF9);
 const SkColor kBackgroundColor2 = SkColorSetRGB(0xE8, 0xE8, 0xE8);
 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
 const int TableHeader::kHorizontalPadding = 7;
 // static
 const int TableHeader::kSortIndicatorWidth = kSortIndicatorSize +
     TableHeader::kHorizontalPadding * 2;
 
 typedef std::vector<TableView::VisibleColumn> Columns;
 
@@ skipping 108 matching lines @@
     }
   }
 }
 
 gfx::Size TableHeader::GetPreferredSize() {
   return gfx::Size(1, kVerticalPadding * 2 + font_list_.GetHeight());
 }
 
 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) {
   if (event.IsOnlyLeftMouseButton()) {
     StartResize(event);
     return true;
   }
 
   // Return false so that context menus on ancestors work.
   return false;
@@ skipping 90 matching lines @@
   if (index > 0 && x >= column.x - kResizePadding &&
       x <= column.x + kResizePadding) {
     return index - 1;
   }
   const int max_x = column.x + column.width;
   return (x >= max_x - kResizePadding && x <= max_x + kResizePadding) ?
       index : -1;
 }
 
 }  // namespace views