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

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

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors Created 6 years, 2 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.cc ('k') | content/common/cursors/webcursor_ozone.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 ui::PlatformCursor WebCursor::GetPlatformCursor() { 14 ui::PlatformCursor WebCursor::GetPlatformCursor() {
15 if (!IsCustom()) 15 if (!IsCustom())
16 return LoadCursor(NULL, IDC_ARROW); 16 return LoadCursor(nullptr, 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_,
25 !custom_data_.empty() ? &custom_data_[0] : NULL, 25 !custom_data_.empty() ? &custom_data_[0] : nullptr,
26 custom_data_.size()); 26 custom_data_.size());
27 return custom_cursor_; 27 return custom_cursor_;
28 } 28 }
29 29
30 void WebCursor::SetDisplayInfo(const gfx::Display& display) { 30 void WebCursor::SetDisplayInfo(const gfx::Display& display) {
31 // TODO(winguru): Add support for scaling the cursor. 31 // TODO(winguru): Add support for scaling the cursor.
32 } 32 }
33 33
34 void WebCursor::InitPlatformData() { 34 void WebCursor::InitPlatformData() {
35 custom_cursor_ = NULL; 35 custom_cursor_ = nullptr;
36 } 36 }
37 37
38 bool WebCursor::SerializePlatformData(Pickle* pickle) const { 38 bool WebCursor::SerializePlatformData(Pickle* pickle) const {
39 return true; 39 return true;
40 } 40 }
41 41
42 bool WebCursor::DeserializePlatformData(PickleIterator* iter) { 42 bool WebCursor::DeserializePlatformData(PickleIterator* iter) {
43 return true; 43 return true;
44 } 44 }
45 45
46 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const { 46 bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
47 return true; 47 return true;
48 } 48 }
49 49
50 void WebCursor::CleanupPlatformData() { 50 void WebCursor::CleanupPlatformData() {
51 if (custom_cursor_) { 51 if (custom_cursor_) {
52 DestroyIcon(custom_cursor_); 52 DestroyIcon(custom_cursor_);
53 custom_cursor_ = NULL; 53 custom_cursor_ = nullptr;
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.cc ('k') | content/common/cursors/webcursor_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698