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

Unified 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_aurawin.cc
diff --git a/content/common/cursors/webcursor_aurawin.cc b/content/common/cursors/webcursor_aurawin.cc
index 15ae5b46c3f5eefff5d114b3d636307fe62e8a48..5b594f8caebd65bd6f06d39b6ed21309e4ef1a92 100644
--- a/content/common/cursors/webcursor_aurawin.cc
+++ b/content/common/cursors/webcursor_aurawin.cc
@@ -13,7 +13,7 @@ namespace content {
ui::PlatformCursor WebCursor::GetPlatformCursor() {
if (!IsCustom())
- return LoadCursor(NULL, IDC_ARROW);
+ return LoadCursor(nullptr, IDC_ARROW);
if (custom_cursor_)
return custom_cursor_;
@@ -22,7 +22,7 @@ ui::PlatformCursor WebCursor::GetPlatformCursor() {
IconUtil::CreateCursorFromDIB(
custom_size_,
hotspot_,
- !custom_data_.empty() ? &custom_data_[0] : NULL,
+ !custom_data_.empty() ? &custom_data_[0] : nullptr,
custom_data_.size());
return custom_cursor_;
}
@@ -32,7 +32,7 @@ void WebCursor::SetDisplayInfo(const gfx::Display& display) {
}
void WebCursor::InitPlatformData() {
- custom_cursor_ = NULL;
+ custom_cursor_ = nullptr;
}
bool WebCursor::SerializePlatformData(Pickle* pickle) const {
@@ -50,7 +50,7 @@ bool WebCursor::IsPlatformDataEqual(const WebCursor& other) const {
void WebCursor::CleanupPlatformData() {
if (custom_cursor_) {
DestroyIcon(custom_cursor_);
- custom_cursor_ = NULL;
+ custom_cursor_ = nullptr;
}
}
« 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