| 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;
|
| }
|
| }
|
|
|
|
|