Fix mouse lock on chromeos

ui/aura/shared/compound_event_filter.h

 // 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.
 
 #ifndef UI_AURA_SHARED_COMPOUND_EVENT_FILTER_H_
 #define UI_AURA_SHARED_COMPOUND_EVENT_FILTER_H_
 
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "ui/aura/aura_export.h"
@@ skipping 22 matching lines @@
 // rest of the filter(s) and CompoundEventFilter will not see the consumed
 // event.
 class AURA_EXPORT CompoundEventFilter : public EventFilter {
  public:
   CompoundEventFilter();
   virtual ~CompoundEventFilter();
 
   // Returns the cursor for the specified component.
   static gfx::NativeCursor CursorForWindowComponent(int window_component);
 
-  void set_update_cursor_visibility(bool update) {
-    update_cursor_visibility_ = update;
-  }
-
   // Adds/removes additional event filters. This does not take ownership of
   // the EventFilter.
   // NOTE: EventFilters are deprecated. Use env::AddPreTargetEventHandler etc.
   // instead.
   void AddFilter(EventFilter* filter);
   void RemoveFilter(EventFilter* filter);
 
  private:
   // Updates the cursor if the target provides a custom one, and provides
   // default resize cursors for window edges.
   void UpdateCursor(Window* target, ui::MouseEvent* event);
 
   // Dispatches event to additional filters.
   ui::EventResult FilterKeyEvent(ui::KeyEvent* event);
   ui::EventResult FilterMouseEvent(ui::MouseEvent* event);
   ui::TouchStatus FilterTouchEvent(Window* target, ui::TouchEvent* event);
 
   // Sets the visibility of the cursor if the event is not synthesized and
   // |update_cursor_visibility_| is true.

[sky, 2012/09/26 13:42:04]

Update comment.

[oshima, 2012/09/26 15:18:00]

Done.

   void SetCursorVisibilityOnEvent(aura::Window* target,
                                   ui::Event* event,
                                   bool show);
 
   // Overridden from EventFilter:
   virtual ui::TouchStatus PreHandleTouchEvent(Window* target,
                                               ui::TouchEvent* event) OVERRIDE;
 
   // Overridden from ui::EventHandler:
   virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
   virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
   virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
   virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
   virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   // Additional event filters that pre-handles events.
   ObserverList<EventFilter, true> filters_;
 
-  // Should we show the mouse cursor when we see mouse movement and hide it when
-  // we see a touch event?
-  bool update_cursor_visibility_;
+  // True if the cursur was hidden by the filter.
+  bool cursor_hidden_by_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(CompoundEventFilter);
 };
 
 }  // namespace shared
 }  // namespace aura
 
 #endif  // UI_AURA_COMPOUND_EVENT_FILTER_H_