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

Side by Side Diff: content/common/cursors/webcursor_aurawin.cc

Issue 201473002: Move webcursors code from webkit/ to content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gfx image include 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/cursors/webcursor_aura.cc ('k') | content/common/cursors/webcursor_aurax11.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/common/cursors/webcursor.h" 5 #include "content/common/cursors/webcursor.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 8
9 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 9 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
10 #include "ui/gfx/icon_util.h" 10 #include "ui/gfx/icon_util.h"
11 11
12 namespace content {
13
12 const ui::PlatformCursor WebCursor::GetPlatformCursor() { 14 const ui::PlatformCursor WebCursor::GetPlatformCursor() {
13 if (!IsCustom()) 15 if (!IsCustom())
14 return LoadCursor(NULL, IDC_ARROW); 16 return LoadCursor(NULL, IDC_ARROW);
15 17
16 if (custom_cursor_) 18 if (custom_cursor_)
17 return custom_cursor_; 19 return custom_cursor_;
18 20
19 custom_cursor_ = 21 custom_cursor_ =
20 IconUtil::CreateCursorFromDIB( 22 IconUtil::CreateCursorFromDIB(
21 custom_size_, 23 custom_size_,
(...skipping 25 matching lines...) Expand all
47 49
48 void WebCursor::CleanupPlatformData() { 50 void WebCursor::CleanupPlatformData() {
49 if (custom_cursor_) { 51 if (custom_cursor_) {
50 DestroyIcon(custom_cursor_); 52 DestroyIcon(custom_cursor_);
51 custom_cursor_ = NULL; 53 custom_cursor_ = NULL;
52 } 54 }
53 } 55 }
54 56
55 void WebCursor::CopyPlatformData(const WebCursor& other) { 57 void WebCursor::CopyPlatformData(const WebCursor& other) {
56 } 58 }
59
60 } // namespace content
OLDNEW
« no previous file with comments | « content/common/cursors/webcursor_aura.cc ('k') | content/common/cursors/webcursor_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698