Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc |
index 8ff3036fdf34f65decc0884841fef8270d91ea1b..e9e2992fabe7d6d55f8bbbde826656fb193f403e 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc |
@@ -95,7 +95,7 @@ gfx::NativeView RenderWidgetHostViewAura::GetNativeView() const { |
} |
gfx::NativeViewId RenderWidgetHostViewAura::GetNativeViewId() const { |
- return NULL; |
+ return static_cast<gfx::NativeViewId>(NULL); |
} |
void RenderWidgetHostViewAura::MovePluginWindows( |
@@ -339,7 +339,7 @@ bool RenderWidgetHostViewAura::OnKeyEvent(aura::KeyEvent* event) { |
gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) { |
// TODO(beng): talk to beng before implementing this. |
//NOTIMPLEMENTED(); |
- return NULL; |
+ return gfx::kNullCursor; |
} |
int RenderWidgetHostViewAura::GetNonClientComponent( |