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

Side by Side Diff: webkit/glue/webcursor_aura.cc

Issue 10919135: Move ash specific cursor code to CursorManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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 | « ui/ui.gyp ('k') | no next file » | 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/glue/webcursor.h" 5 #include "webkit/glue/webcursor.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h" 8 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
9 #include "ui/base/cursor/cursor.h" 9 #include "ui/base/cursor/cursor.h"
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 return ui::kCursorNotAllowed; 92 return ui::kCursorNotAllowed;
93 case WebCursorInfo::TypeZoomIn: 93 case WebCursorInfo::TypeZoomIn:
94 return ui::kCursorZoomIn; 94 return ui::kCursorZoomIn;
95 case WebCursorInfo::TypeZoomOut: 95 case WebCursorInfo::TypeZoomOut:
96 return ui::kCursorZoomOut; 96 return ui::kCursorZoomOut;
97 case WebCursorInfo::TypeGrab: 97 case WebCursorInfo::TypeGrab:
98 return ui::kCursorGrab; 98 return ui::kCursorGrab;
99 case WebCursorInfo::TypeGrabbing: 99 case WebCursorInfo::TypeGrabbing:
100 return ui::kCursorGrabbing; 100 return ui::kCursorGrabbing;
101 case WebCursorInfo::TypeCustom: { 101 case WebCursorInfo::TypeCustom: {
102 ui::Cursor cursor; 102 ui::Cursor cursor(ui::kCursorCustom);
103 cursor.SetPlatformCursor(GetPlatformCursor()); 103 cursor.SetPlatformCursor(GetPlatformCursor());
104 return cursor; 104 return cursor;
105 } 105 }
106 default: 106 default:
107 NOTREACHED(); 107 NOTREACHED();
108 return gfx::kNullCursor; 108 return gfx::kNullCursor;
109 } 109 }
110 } 110 }
OLDNEW
« no previous file with comments | « ui/ui.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698