diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:39:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-02 00:39:26 +0000 |
| commit | eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13 (patch) | |
| tree | aa7ba22226537c129db8e755ae1f3580c7f6d73e /views | |
| parent | 9978f269d897907a21140fcbc75ed76c4b93d117 (diff) | |
| download | chromium_src-eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13.zip chromium_src-eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13.tar.gz chromium_src-eaf6dd563c1057e8adb4ec20d0d85e2c07cb5f13.tar.bz2 | |
Handle interactive window sizing and moving, as well as primitive z-index shuffling.
http://crbug.com/93937
http://crbug.com/93938
TEST=none
Review URL: http://codereview.chromium.org/7792069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/aura_desktop/aura_desktop_main.cc | 3 | ||||
| -rw-r--r-- | views/widget/native_widget_aura.cc | 6 | ||||
| -rw-r--r-- | views/widget/native_widget_aura.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/views/aura_desktop/aura_desktop_main.cc b/views/aura_desktop/aura_desktop_main.cc index 219f5e5..6c3d049 100644 --- a/views/aura_desktop/aura_desktop_main.cc +++ b/views/aura_desktop/aura_desktop_main.cc @@ -27,6 +27,9 @@ class DemoWindowDelegate : public aura::WindowDelegate { public: explicit DemoWindowDelegate(SkColor color) : color_(color) {} + virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { + return HTCLIENT; + } virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE { return true; } diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index fc5e5bb..92572e2 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -363,6 +363,10 @@ void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) { //////////////////////////////////////////////////////////////////////////////// // NativeWidgetAura, aura::WindowDelegate implementation: +int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const { + return delegate_->GetNonClientComponent(point); +} + bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) { return delegate_->OnMouseEvent(MouseEvent(event)); } @@ -394,8 +398,6 @@ bool Widget::ConvertRect(const Widget* source, return false; } - - namespace internal { //////////////////////////////////////////////////////////////////////////////// diff --git a/views/widget/native_widget_aura.h b/views/widget/native_widget_aura.h index 8c1f495..3a870d9 100644 --- a/views/widget/native_widget_aura.h +++ b/views/widget/native_widget_aura.h @@ -109,6 +109,7 @@ class NativeWidgetAura : public internal::NativeWidgetPrivate, virtual void DispatchKeyEventPostIME(const KeyEvent& key) OVERRIDE; // Overridden from aura::WindowDelegate: + virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; virtual bool OnMouseEvent(aura::MouseEvent* event) OVERRIDE; virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; virtual void OnWindowDestroyed() OVERRIDE; |