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

Side by Side Diff: webkit/common/cursors/webcursor_aura.cc

Issue 134823003: Define Panning cursors only on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/resources/ui_resources.grd ('k') | webkit/common/cursors/webcursor_gtk.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 "webkit/common/cursors/webcursor.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/WebKit/public/platform/WebCursorInfo.h" 8 #include "third_party/WebKit/public/platform/WebCursorInfo.h"
9 #include "ui/base/cursor/cursor.h" 9 #include "ui/base/cursor/cursor.h"
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 case WebCursorInfo::TypeEastWestResize: 45 case WebCursorInfo::TypeEastWestResize:
46 return ui::kCursorEastWestResize; 46 return ui::kCursorEastWestResize;
47 case WebCursorInfo::TypeNorthEastSouthWestResize: 47 case WebCursorInfo::TypeNorthEastSouthWestResize:
48 return ui::kCursorNorthEastSouthWestResize; 48 return ui::kCursorNorthEastSouthWestResize;
49 case WebCursorInfo::TypeNorthWestSouthEastResize: 49 case WebCursorInfo::TypeNorthWestSouthEastResize:
50 return ui::kCursorNorthWestSouthEastResize; 50 return ui::kCursorNorthWestSouthEastResize;
51 case WebCursorInfo::TypeColumnResize: 51 case WebCursorInfo::TypeColumnResize:
52 return ui::kCursorColumnResize; 52 return ui::kCursorColumnResize;
53 case WebCursorInfo::TypeRowResize: 53 case WebCursorInfo::TypeRowResize:
54 return ui::kCursorRowResize; 54 return ui::kCursorRowResize;
55 #if defined(OS_WIN)
55 case WebCursorInfo::TypeMiddlePanning: 56 case WebCursorInfo::TypeMiddlePanning:
56 return ui::kCursorMiddlePanning; 57 return ui::kCursorMiddlePanning;
57 case WebCursorInfo::TypeEastPanning: 58 case WebCursorInfo::TypeEastPanning:
58 return ui::kCursorEastPanning; 59 return ui::kCursorEastPanning;
59 case WebCursorInfo::TypeNorthPanning: 60 case WebCursorInfo::TypeNorthPanning:
60 return ui::kCursorNorthPanning; 61 return ui::kCursorNorthPanning;
61 case WebCursorInfo::TypeNorthEastPanning: 62 case WebCursorInfo::TypeNorthEastPanning:
62 return ui::kCursorNorthEastPanning; 63 return ui::kCursorNorthEastPanning;
63 case WebCursorInfo::TypeNorthWestPanning: 64 case WebCursorInfo::TypeNorthWestPanning:
64 return ui::kCursorNorthWestPanning; 65 return ui::kCursorNorthWestPanning;
65 case WebCursorInfo::TypeSouthPanning: 66 case WebCursorInfo::TypeSouthPanning:
66 return ui::kCursorSouthPanning; 67 return ui::kCursorSouthPanning;
67 case WebCursorInfo::TypeSouthEastPanning: 68 case WebCursorInfo::TypeSouthEastPanning:
68 return ui::kCursorSouthEastPanning; 69 return ui::kCursorSouthEastPanning;
69 case WebCursorInfo::TypeSouthWestPanning: 70 case WebCursorInfo::TypeSouthWestPanning:
70 return ui::kCursorSouthWestPanning; 71 return ui::kCursorSouthWestPanning;
71 case WebCursorInfo::TypeWestPanning: 72 case WebCursorInfo::TypeWestPanning:
72 return ui::kCursorWestPanning; 73 return ui::kCursorWestPanning;
74 #endif
73 case WebCursorInfo::TypeMove: 75 case WebCursorInfo::TypeMove:
74 return ui::kCursorMove; 76 return ui::kCursorMove;
75 case WebCursorInfo::TypeVerticalText: 77 case WebCursorInfo::TypeVerticalText:
76 return ui::kCursorVerticalText; 78 return ui::kCursorVerticalText;
77 case WebCursorInfo::TypeCell: 79 case WebCursorInfo::TypeCell:
78 return ui::kCursorCell; 80 return ui::kCursorCell;
79 case WebCursorInfo::TypeContextMenu: 81 case WebCursorInfo::TypeContextMenu:
80 return ui::kCursorContextMenu; 82 return ui::kCursorContextMenu;
81 case WebCursorInfo::TypeAlias: 83 case WebCursorInfo::TypeAlias:
82 return ui::kCursorAlias; 84 return ui::kCursorAlias;
(...skipping 18 matching lines...) Expand all
101 case WebCursorInfo::TypeCustom: { 103 case WebCursorInfo::TypeCustom: {
102 ui::Cursor cursor(ui::kCursorCustom); 104 ui::Cursor cursor(ui::kCursorCustom);
103 cursor.SetPlatformCursor(GetPlatformCursor()); 105 cursor.SetPlatformCursor(GetPlatformCursor());
104 return cursor; 106 return cursor;
105 } 107 }
106 default: 108 default:
107 NOTREACHED(); 109 NOTREACHED();
108 return gfx::kNullCursor; 110 return gfx::kNullCursor;
109 } 111 }
110 } 112 }
OLDNEW
« no previous file with comments | « ui/resources/ui_resources.grd ('k') | webkit/common/cursors/webcursor_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698