| Index: ui/base/cursor/cursor_loader_win.cc
|
| diff --git a/ui/base/cursor/cursor_loader_win.cc b/ui/base/cursor/cursor_loader_win.cc
|
| index 3faa046e552ed911f7a20848be94cb11b4911a1b..feb74e977f94e3bfb3ed3c0321c0eb0373b40779 100644
|
| --- a/ui/base/cursor/cursor_loader_win.cc
|
| +++ b/ui/base/cursor/cursor_loader_win.cc
|
| @@ -7,15 +7,10 @@
|
| #include "base/lazy_instance.h"
|
| #include "base/strings/string16.h"
|
| #include "grit/ui_unscaled_resources.h"
|
| -
|
| -#if defined(USE_AURA)
|
| #include "ui/base/cursor/cursor.h"
|
| -#endif
|
|
|
| namespace ui {
|
|
|
| -#if defined(USE_AURA)
|
| -
|
| namespace {
|
|
|
| base::LazyInstance<base::string16> g_cursor_resource_module_name;
|
| @@ -120,8 +115,6 @@ const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
|
|
|
| } // namespace
|
|
|
| -#endif
|
| -
|
| CursorLoader* CursorLoader::Create() {
|
| return new CursorLoaderWin;
|
| }
|
| @@ -150,7 +143,6 @@ void CursorLoaderWin::UnloadAll() {
|
| }
|
|
|
| void CursorLoaderWin::SetPlatformCursor(gfx::NativeCursor* cursor) {
|
| -#if defined(USE_AURA)
|
| if (cursor->native_type() != kCursorCustom) {
|
| if (cursor->platform()) {
|
| cursor->SetPlatformCursor(cursor->platform());
|
| @@ -165,15 +157,12 @@ void CursorLoaderWin::SetPlatformCursor(gfx::NativeCursor* cursor) {
|
| cursor->SetPlatformCursor(platform_cursor);
|
| }
|
| }
|
| -#endif
|
| }
|
|
|
| -#if defined(USE_AURA)
|
| // static
|
| void CursorLoaderWin::SetCursorResourceModule(
|
| const base::string16& module_name) {
|
| g_cursor_resource_module_name.Get() = module_name;
|
| }
|
| -#endif
|
|
|
| } // namespace ui
|
|
|