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

ui/views/corewm/compound_event_filter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/compound_event_filter.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 167 matching lines @@
     ObserverListBase<ui::EventHandler>::Iterator it(handlers_);
     ui::EventHandler* handler;
     while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
       handler->OnTouchEvent(event);
   }
 }
 
 void CompoundEventFilter::SetCursorVisibilityOnEvent(aura::Window* target,
                                                      ui::Event* event,
                                                      bool show) {
-  DCHECK(ShouldHideCursorOnTouch());
   if (event->flags() & ui::EF_IS_SYNTHESIZED)
     return;
 
   aura::client::CursorClient* client =
       aura::client::GetCursorClient(target->GetRootWindow());
   if (!client)
     return;
 
   if (show && cursor_hidden_by_filter_) {
     cursor_hidden_by_filter_ = false;
@@ skipping 48 matching lines @@
   // It should also update the cursor for clicking and wheels for ChromeOS boot.
   // When ChromeOS is booted, it hides the mouse cursor but immediate mouse
   // operation will show the cursor.
   // We also update the cursor for mouse enter in case a mouse cursor is sent to
   // outside of the root window and moved back for some reasons (e.g. running on
   // on Desktop for testing, or a bug in pointer barrier).
   if (event->type() == ui::ET_MOUSE_ENTERED ||
       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);
   }
 
   FilterMouseEvent(event);
 }
 
 void CompoundEventFilter::OnScrollEvent(ui::ScrollEvent* event) {
 }
 
 void CompoundEventFilter::OnTouchEvent(ui::TouchEvent* event) {
@@ skipping 10 matching lines @@
   if (handlers_.might_have_observers()) {
     ObserverListBase<ui::EventHandler>::Iterator it(handlers_);
     ui::EventHandler* handler;
     while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
       handler->OnGestureEvent(event);
   }
 }
 
 }  // namespace corewm
 }  // namespace views