Merge 173933

ui/views/widget/desktop_aura/desktop_cursor_client.cc

Index: ui/views/widget/desktop_aura/desktop_cursor_client.cc
===================================================================
--- ui/views/widget/desktop_aura/desktop_cursor_client.cc	(revision 177177)
+++ ui/views/widget/desktop_aura/desktop_cursor_client.cc	(working copy)
@@ -26,21 +26,34 @@
     root_window_->SetCursor(current_cursor_);
 }
 
-void DesktopCursorClient::ShowCursor(bool show) {
-  if (cursor_visible_ == show)
-    return;
-  cursor_visible_ = show;
-  if (cursor_visible_)
-    root_window_->SetCursor(current_cursor_);
-  else
-    root_window_->SetCursor(ui::kCursorNone);
-  root_window_->OnCursorVisibilityChanged(cursor_visible_);
+void DesktopCursorClient::ShowCursor() {
+  SetCursorVisibility(true);
 }
 
+void DesktopCursorClient::HideCursor() {
+  SetCursorVisibility(false);
+}
+
 bool DesktopCursorClient::IsCursorVisible() const {
   return cursor_visible_;
 }
 
+void DesktopCursorClient::EnableMouseEvents() {
+  // TODO(mazda): Implement this.
+  NOTIMPLEMENTED();
+}
+
+void DesktopCursorClient::DisableMouseEvents() {
+  // TODO(mazda): Implement this.
+  NOTIMPLEMENTED();
+}
+
+bool DesktopCursorClient::IsMouseEventsEnabled() const {
+  // TODO(mazda): Implement this.
+  NOTIMPLEMENTED();
+  return true;
+}
+
 void DesktopCursorClient::SetDeviceScaleFactor(float device_scale_factor) {
   cursor_loader_->UnloadAll();
   cursor_loader_->set_device_scale_factor(device_scale_factor);
@@ -56,4 +69,12 @@
   NOTIMPLEMENTED();
 }
 
+void DesktopCursorClient::SetCursorVisibility(bool visible) {
+  if (cursor_visible_ == visible)
+    return;
+  cursor_visible_ = visible;
+  root_window_->SetCursor(current_cursor_);
+  root_window_->OnCursorVisibilityChanged(visible);
+}
+
 }  // namespace views