summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_views.cc2
-rw-r--r--chrome/browser/ui/views/content_setting_bubble_contents.cc2
-rw-r--r--chrome/browser/ui/views/extensions/extension_view.cc2
-rw-r--r--ui/aura/window.cc2
-rw-r--r--ui/aura_shell/toplevel_frame_view.cc2
-rw-r--r--ui/gfx/native_widget_types.h3
-rw-r--r--views/controls/link.cc4
-rw-r--r--views/controls/resize_area.cc4
-rw-r--r--views/controls/single_split_view.cc4
-rw-r--r--views/controls/textfield/native_textfield_views.cc2
-rw-r--r--views/view.cc2
-rw-r--r--views/widget/native_widget_aura.cc2
-rw-r--r--views/widget/native_widget_view.cc3
-rw-r--r--views/widget/root_view.cc2
-rw-r--r--webkit/glue/webcursor_aurax11.cc2
15 files changed, 21 insertions, 17 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index cbc42cd..4ad443c 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -101,7 +101,7 @@ RenderWidgetHostViewViews::RenderWidgetHostViewViews(RenderWidgetHost* host)
about_to_validate_and_paint_(false),
is_hidden_(false),
is_loading_(false),
- native_cursor_(NULL),
+ native_cursor_(gfx::kNullCursor),
is_showing_context_menu_(false),
visually_deemphasized_(false),
touch_event_(),
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 29332a7..16f3d15 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -95,7 +95,7 @@ gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursor(
return g_hand_cursor;
#elif defined(USE_AURA)
// TODO(saintlou):
- return NULL;
+ return gfx::kNullCursor;
#elif defined(TOOLKIT_USES_GTK)
return gfx::GetCursor(GDK_HAND2);
#endif
diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc
index add2108..d25ebe56 100644
--- a/chrome/browser/ui/views/extensions/extension_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_view.cc
@@ -60,7 +60,7 @@ void ExtensionView::SetIsClipped(bool is_clipped) {
}
gfx::NativeCursor ExtensionView::GetCursor(const views::MouseEvent& event) {
- return NULL;
+ return gfx::kNullCursor;
}
void ExtensionView::SetVisible(bool is_visible) {
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 33f7998..4bdb3be 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -240,7 +240,7 @@ void Window::ConvertPointToWindow(Window* source,
}
gfx::NativeCursor Window::GetCursor(const gfx::Point& point) const {
- return delegate_ ? delegate_->GetCursor(point) : NULL;
+ return delegate_ ? delegate_->GetCursor(point) : gfx::kNullCursor;
}
void Window::SetEventFilter(EventFilter* event_filter) {
diff --git a/ui/aura_shell/toplevel_frame_view.cc b/ui/aura_shell/toplevel_frame_view.cc
index cdbc4b4..e1a615f 100644
--- a/ui/aura_shell/toplevel_frame_view.cc
+++ b/ui/aura_shell/toplevel_frame_view.cc
@@ -492,7 +492,7 @@ gfx::NativeCursor ToplevelFrameView::GetCursor(const views::MouseEvent& event) {
return NULL;
#elif defined(OS_LINUX)
NOTIMPLEMENTED();
- return NULL;
+ return gfx::kNullCursor;
#endif
}
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index a960864..319f3a3 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -165,6 +165,9 @@ typedef void* NativeMenu;
typedef void* NativeViewAccessible;
#endif
+// A constant value to indicate that gfx::NativeCursor refers to no cursor.
+const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL);
+
#if defined(OS_MACOSX)
typedef NSImage NativeImageType;
#elif defined(TOOLKIT_GTK)
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 5f1776f..2131ed1 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -100,7 +100,7 @@ std::string Link::GetClassName() const {
gfx::NativeCursor Link::GetCursor(const MouseEvent& event) {
if (!IsEnabled())
- return NULL;
+ return gfx::kNullCursor;
#if defined(OS_WIN)
static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
return g_hand_cursor;
@@ -108,7 +108,7 @@ gfx::NativeCursor Link::GetCursor(const MouseEvent& event) {
return gfx::GetCursor(GDK_HAND2);
#else
// TODO(saintlou):
- return NULL;
+ return gfx::kNullCursor;
#endif
}
diff --git a/views/controls/resize_area.cc b/views/controls/resize_area.cc
index 6492d11..242498c 100644
--- a/views/controls/resize_area.cc
+++ b/views/controls/resize_area.cc
@@ -34,13 +34,13 @@ std::string ResizeArea::GetClassName() const {
gfx::NativeCursor ResizeArea::GetCursor(const MouseEvent& event) {
if (!IsEnabled())
- return NULL;
+ return gfx::kNullCursor;
#if defined(OS_WIN)
static HCURSOR g_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
return g_resize_cursor;
#elif defined(USE_AURA)
// TODO(saintlou):
- return NULL;
+ return gfx::kNullCursor;
#elif defined(OS_LINUX)
return gfx::GetCursor(GDK_SB_H_DOUBLE_ARROW);
#endif
diff --git a/views/controls/single_split_view.cc b/views/controls/single_split_view.cc
index f8df578..4e46cfe 100644
--- a/views/controls/single_split_view.cc
+++ b/views/controls/single_split_view.cc
@@ -95,7 +95,7 @@ gfx::Size SingleSplitView::GetPreferredSize() {
gfx::NativeCursor SingleSplitView::GetCursor(const MouseEvent& event) {
if (!IsPointInDivider(event.location()))
- return NULL;
+ return gfx::kNullCursor;
#if defined(OS_WIN)
static HCURSOR we_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
static HCURSOR ns_resize_cursor = LoadCursor(NULL, IDC_SIZENS);
@@ -105,7 +105,7 @@ gfx::NativeCursor SingleSplitView::GetCursor(const MouseEvent& event) {
GDK_SB_V_DOUBLE_ARROW);
#else
// TODO(saintlou):
- return NULL;
+ return gfx::kNullCursor;
#endif
}
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index 64835c5..8d8f609 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -298,7 +298,7 @@ gfx::NativeCursor NativeTextfieldViews::GetCursor(const MouseEvent& event) {
#elif defined(USE_AURA)
// TODO(saintlou):
(void)text_cursor;
- return NULL;
+ return gfx::kNullCursor;
#else
return text_cursor ? gfx::GetCursor(GDK_XTERM) : NULL;
#endif
diff --git a/views/view.cc b/views/view.cc
index b49fab6..90210dd 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -726,7 +726,7 @@ gfx::NativeCursor View::GetCursor(const MouseEvent& event) {
static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
return arrow;
#else
- return NULL;
+ return gfx::kNullCursor;
#endif
}
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc
index d910843..b261571 100644
--- a/views/widget/native_widget_aura.cc
+++ b/views/widget/native_widget_aura.cc
@@ -63,7 +63,7 @@ NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
can_activate_(true),
- cursor_(NULL) {
+ cursor_(gfx::kNullCursor) {
}
NativeWidgetAura::~NativeWidgetAura() {
diff --git a/views/widget/native_widget_view.cc b/views/widget/native_widget_view.cc
index d9d6289..98b8bd5 100644
--- a/views/widget/native_widget_view.cc
+++ b/views/widget/native_widget_view.cc
@@ -6,6 +6,7 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/compositor/layer.h"
+#include "ui/gfx/native_widget_types.h"
namespace views {
namespace internal {
@@ -20,7 +21,7 @@ NativeWidgetView::NativeWidgetView(NativeWidgetViews* native_widget)
: native_widget_(native_widget),
sent_create_(false),
delete_native_widget_(true),
- cursor_(NULL) {
+ cursor_(gfx::kNullCursor) {
}
NativeWidgetView::~NativeWidgetView() {
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 1d60945..8c0de57 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -306,7 +306,7 @@ void RootView::OnMouseMoved(const MouseEvent& event) {
widget_->SetCursor(mouse_move_handler_->GetCursor(moved_event));
} else if (mouse_move_handler_ != NULL) {
mouse_move_handler_->OnMouseExited(e);
- widget_->SetCursor(NULL);
+ widget_->SetCursor(gfx::kNullCursor);
}
}
diff --git a/webkit/glue/webcursor_aurax11.cc b/webkit/glue/webcursor_aurax11.cc
index 85a4b3c..4f12fd4 100644
--- a/webkit/glue/webcursor_aurax11.cc
+++ b/webkit/glue/webcursor_aurax11.cc
@@ -29,7 +29,7 @@ class CursorCache {
}
Cursor GetCursor(int web_cursor_info_type) {
- Cursor cursor = NULL;
+ Cursor cursor = static_cast<Cursor>(NULL);
std::pair<std::map<int, Cursor>::iterator, bool> it = cache_.insert(
std::make_pair(web_cursor_info_type, cursor));
if (it.second) {
generated by cgit v1.1 at 2025-02-06 18:15:34 +0000