diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 17:03:13 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 17:03:13 +0000 |
| commit | c4170c98f76cc7d6bf4eddd13291884b3523010b (patch) | |
| tree | 02cc9cc72994b3ebeec95362b339e56ef545b7c7 /views | |
| parent | 5dc6aaac9422f0afd458fc24ef64a23270cb8d70 (diff) | |
| download | chromium_src-c4170c98f76cc7d6bf4eddd13291884b3523010b.zip chromium_src-c4170c98f76cc7d6bf4eddd13291884b3523010b.tar.gz chromium_src-c4170c98f76cc7d6bf4eddd13291884b3523010b.tar.bz2 | |
Fix clang compile errors for USE_AURA=1
Fixes various clang-reported errors when USE_AURA=1
BUG=none
TEST=Compile on Mac/Clang. Trybots.
Review URL: http://codereview.chromium.org/8229029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/native_widget_aura.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/views/widget/native_widget_aura.cc b/views/widget/native_widget_aura.cc index 6877a91..b3673a0 100644 --- a/views/widget/native_widget_aura.cc +++ b/views/widget/native_widget_aura.cc @@ -486,7 +486,8 @@ bool NativeWidgetAura::OnKeyEvent(aura::KeyEvent* event) { InputMethod* input_method = GetWidget()->GetInputMethod(); DCHECK(input_method); // TODO(oshima): DispatchKeyEvent should return bool? - input_method->DispatchKeyEvent(KeyEvent(event)); + KeyEvent views_event(event); + input_method->DispatchKeyEvent(views_event); return true; } @@ -500,9 +501,12 @@ int NativeWidgetAura::GetNonClientComponent(const gfx::Point& point) const { bool NativeWidgetAura::OnMouseEvent(aura::MouseEvent* event) { DCHECK(window_->IsVisible()); - if (event->type() == ui::ET_MOUSEWHEEL) - return delegate_->OnMouseEvent(MouseWheelEvent(event)); - return delegate_->OnMouseEvent(MouseEvent(event)); + if (event->type() == ui::ET_MOUSEWHEEL) { + MouseWheelEvent wheel_event(event); + return delegate_->OnMouseEvent(wheel_event); + } + MouseEvent mouse_event(event); + return delegate_->OnMouseEvent(mouse_event); } bool NativeWidgetAura::ShouldActivate(aura::MouseEvent* event) { |