| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "webkit/glue/webcursor.h" | 5 #include "webkit/common/cursors/webcursor.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 | 8 |
| 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" | 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" |
| 10 #include "ui/gfx/icon_util.h" | 10 #include "ui/gfx/icon_util.h" |
| 11 | 11 |
| 12 const ui::PlatformCursor WebCursor::GetPlatformCursor() { | 12 const ui::PlatformCursor WebCursor::GetPlatformCursor() { |
| 13 if (!IsCustom()) | 13 if (!IsCustom()) |
| 14 return LoadCursor(NULL, IDC_ARROW); | 14 return LoadCursor(NULL, IDC_ARROW); |
| 15 | 15 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 | 47 |
| 48 void WebCursor::CleanupPlatformData() { | 48 void WebCursor::CleanupPlatformData() { |
| 49 if (custom_cursor_) { | 49 if (custom_cursor_) { |
| 50 DestroyIcon(custom_cursor_); | 50 DestroyIcon(custom_cursor_); |
| 51 custom_cursor_ = NULL; | 51 custom_cursor_ = NULL; |
| 52 } | 52 } |
| 53 } | 53 } |
| 54 | 54 |
| 55 void WebCursor::CopyPlatformData(const WebCursor& other) { | 55 void WebCursor::CopyPlatformData(const WebCursor& other) { |
| 56 } | 56 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 15971005:
Move the WebCursor sources from webkit/glue to webkit/common/cursors. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/