Merge 234741 "Gets mouse pointer to show again when existing ful..."

ui/views/corewm/compound_event_filter.cc

Index: ui/views/corewm/compound_event_filter.cc
===================================================================
--- ui/views/corewm/compound_event_filter.cc	(revision 244577)
+++ ui/views/corewm/compound_event_filter.cc	(working copy)
@@ -185,7 +185,6 @@
 void CompoundEventFilter::SetCursorVisibilityOnEvent(aura::Window* target,
                                                      ui::Event* event,
                                                      bool show) {
-  DCHECK(ShouldHideCursorOnTouch());
   if (event->flags() & ui::EF_IS_SYNTHESIZED)
     return;
 
@@ -254,10 +253,8 @@
       event->type() == ui::ET_MOUSE_MOVED ||
       event->type() == ui::ET_MOUSE_PRESSED ||
       event->type() == ui::ET_MOUSEWHEEL) {
-    if (ShouldHideCursorOnTouch()) {
-      SetMouseEventsEnableStateOnEvent(window, event, true);
-      SetCursorVisibilityOnEvent(window, event, true);
-    }
+    SetMouseEventsEnableStateOnEvent(window, event, true);
+    SetCursorVisibilityOnEvent(window, event, true);
     UpdateCursor(window, event);
   }