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

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

Issue 538333002: gn/linux: warnings as errors, turn on Wextra (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 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
« no previous file with comments | « content/common/cursors/webcursor.h ('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 "content/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 { 12 namespace content {
13 13
14 const ui::PlatformCursor WebCursor::GetPlatformCursor() { 14 ui::PlatformCursor WebCursor::GetPlatformCursor() {
15 if (!IsCustom()) 15 if (!IsCustom())
16 return LoadCursor(NULL, IDC_ARROW); 16 return LoadCursor(NULL, IDC_ARROW);
17 17
18 if (custom_cursor_) 18 if (custom_cursor_)
19 return custom_cursor_; 19 return custom_cursor_;
20 20
21 custom_cursor_ = 21 custom_cursor_ =
22 IconUtil::CreateCursorFromDIB( 22 IconUtil::CreateCursorFromDIB(
23 custom_size_, 23 custom_size_,
24 hotspot_, 24 hotspot_,
(...skipping 26 matching lines...) Expand all
51 if (custom_cursor_) { 51 if (custom_cursor_) {
52 DestroyIcon(custom_cursor_); 52 DestroyIcon(custom_cursor_);
53 custom_cursor_ = NULL; 53 custom_cursor_ = NULL;
54 } 54 }
55 } 55 }
56 56
57 void WebCursor::CopyPlatformData(const WebCursor& other) { 57 void WebCursor::CopyPlatformData(const WebCursor& other) {
58 } 58 }
59 59
60 } // namespace content 60 } // namespace content
OLDNEW
« no previous file with comments | « content/common/cursors/webcursor.h ('k') | content/common/cursors/webcursor_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698