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

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

Issue 68683009: Rewrite include paths for Blink public/ headers that have moved (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « webkit/common/cursors/webcursor_android.cc ('k') | webkit/common/cursors/webcursor_aurawin.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/web/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
11 using blink::WebCursorInfo; 11 using blink::WebCursorInfo;
12 12
13 gfx::NativeCursor WebCursor::GetNativeCursor() { 13 gfx::NativeCursor WebCursor::GetNativeCursor() {
14 switch (type_) { 14 switch (type_) {
15 case WebCursorInfo::TypePointer: 15 case WebCursorInfo::TypePointer:
16 return ui::kCursorPointer; 16 return ui::kCursorPointer;
17 case WebCursorInfo::TypeCross: 17 case WebCursorInfo::TypeCross:
18 return ui::kCursorCross; 18 return ui::kCursorCross;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 case WebCursorInfo::TypeCustom: { 101 case WebCursorInfo::TypeCustom: {
102 ui::Cursor cursor(ui::kCursorCustom); 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 | « webkit/common/cursors/webcursor_android.cc ('k') | webkit/common/cursors/webcursor_aurawin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698