diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:28:09 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:28:09 +0000 |
| commit | 900324023da46b31893839c54d43c1f74138e616 (patch) | |
| tree | 3ea382519e8f6c9d932119bb058166396a138056 /ui/aura/root_window_host_mac.mm | |
| parent | b3ef40d5f95c531ff8fc36d5d3a7b9290c7b6ce9 (diff) | |
| download | chromium_src-900324023da46b31893839c54d43c1f74138e616.zip chromium_src-900324023da46b31893839c54d43c1f74138e616.tar.gz chromium_src-900324023da46b31893839c54d43c1f74138e616.tar.bz2 | |
UnConfineCursor addition breaks Mac/Aura
Provide stub implementation for Mac/Aura for this new RootWindowHost
method. Also fixes up other compile and clang/style problem.
MainAppBundle call got renamed to FrameworkBundle.
BUG=None
TEST=None
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9270011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window_host_mac.mm')
| -rw-r--r-- | ui/aura/root_window_host_mac.mm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/root_window_host_mac.mm index 0660a8d..9fba814 100644 --- a/ui/aura/root_window_host_mac.mm +++ b/ui/aura/root_window_host_mac.mm @@ -40,6 +40,8 @@ class RootWindowHostMac : public RootWindowHost, virtual void ShowCursor(bool show) OVERRIDE; virtual gfx::Point QueryMouseLocation() OVERRIDE; virtual void MoveCursorTo(const gfx::Point& location) OVERRIDE; + virtual bool ConfineCursorToRootWindow() OVERRIDE; + virtual void UnConfineCursor() OVERRIDE; // RootWindowHostMacDelegate: virtual void SendEvent(const base::NativeEvent& native_event) OVERRIDE; @@ -144,6 +146,13 @@ gfx::Point RootWindowHostMac::QueryMouseLocation() { void RootWindowHostMac::MoveCursorTo(const gfx::Point& location) { } +bool RootWindowHostMac::ConfineCursorToRootWindow() { + return false; +} + +void RootWindowHostMac::UnConfineCursor() { +} + void RootWindowHostMac::SendEvent(const base::NativeEvent& native_event) { ui::EventType type = ui::EventTypeFromNative(native_event); switch (type) { |