Merge 173933

ui/aura/root_window.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_ROOT_WINDOW_H_
 #define UI_AURA_ROOT_WINDOW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 99 matching lines @@
 
   // Sets the currently-displayed cursor. If the cursor was previously hidden
   // via ShowCursor(false), it will remain hidden until ShowCursor(true) is
   // called, at which point the cursor that was last set via SetCursor() will be
   // used.
   void SetCursor(gfx::NativeCursor cursor);
 
   // Invoked when the cursor's visibility has changed.
   void OnCursorVisibilityChanged(bool visible);
 
+  // Invoked when the mouse events get enabled or disabled.
+  void OnMouseEventsEnableStateChanged(bool enabled);
+
   // Moves the cursor to the specified location relative to the root window.
   virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE;
 
   // Clips the cursor movement to the root_window.
   bool ConfineCursorToWindow();
 
   // Draws the necessary set of windows.
   void Draw();
 
   // Draw the whole screen.
@@ skipping 119 matching lines @@
   // Overridden from Window:
   virtual bool CanFocus() const OVERRIDE;
   virtual bool CanReceiveEvents() const OVERRIDE;
 
   // Overridden from aura::client::CaptureDelegate:
   virtual void UpdateCapture(Window* old_capture, Window* new_capture) OVERRIDE;
   virtual void SetNativeCapture() OVERRIDE;
   virtual void ReleaseNativeCapture() OVERRIDE;
 
   // Exposes RootWindowHost::QueryMouseLocation() for test purposes.
-  gfx::Point QueryMouseLocationForTest() const;
+  bool QueryMouseLocationForTest(gfx::Point* point) const;
 
  private:
   friend class Window;
 
   // The parameter for OnWindowHidden() to specify why window is hidden.
   enum WindowHiddenReason {
     WINDOW_DESTROYED,  // Window is destroyed.
     WINDOW_HIDDEN,     // Window is hidden.
     WINDOW_MOVING,     // Window is temporarily marked as hidden due to move
                        // across root windows.
@@ skipping 125 matching lines @@
   base::WeakPtrFactory<RootWindow> held_mouse_event_factory_;
 
   scoped_ptr<ui::ViewProp> prop_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindow);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_ROOT_WINDOW_H_