summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 04:20:33 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-11 04:20:33 +0000
commit6a73623445e3938c767ac4c56849035b22be5c28 (patch)
tree283a4949010a9fd0243ead9a510a54ec17e1f313 /views/widget
parente39690735bac27e261e00ad237d734827cf1e3c7 (diff)
downloadchromium_src-6a73623445e3938c767ac4c56849035b22be5c28.zip
chromium_src-6a73623445e3938c767ac4c56849035b22be5c28.tar.gz
chromium_src-6a73623445e3938c767ac4c56849035b22be5c28.tar.bz2
Add gfx::kNullCursor to refer to "no cursor"
linux/aura build uses unsigned long as NativeCursor which requires cast to use NULL. Define constants instead. BUG=none TEST=none Review URL: http://codereview.chromium.org/8216016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-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
3 files changed, 4 insertions, 3 deletions
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);
}
}