Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: ui/views/widget/native_widget_aura.cc

Issue 2455143003: Fix mouse wheel events processing. (Closed)
Patch Set: Fix review issues. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/views/test/event_generator_delegate_mac.mm ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 return; 913 return;
914 914
915 delegate_->OnKeyEvent(event); 915 delegate_->OnKeyEvent(event);
916 } 916 }
917 917
918 void NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) { 918 void NativeWidgetAura::OnMouseEvent(ui::MouseEvent* event) {
919 DCHECK(window_); 919 DCHECK(window_);
920 DCHECK(window_->IsVisible()); 920 DCHECK(window_->IsVisible());
921 if (event->type() == ui::ET_MOUSEWHEEL) { 921 if (event->type() == ui::ET_MOUSEWHEEL) {
922 delegate_->OnMouseEvent(event); 922 delegate_->OnMouseEvent(event);
923 if (event->handled()) 923 return;
924 return;
925 } 924 }
926 925
927 if (tooltip_manager_.get()) 926 if (tooltip_manager_.get())
928 tooltip_manager_->UpdateTooltip(); 927 tooltip_manager_->UpdateTooltip();
929 TooltipManagerAura::UpdateTooltipManagerForCapture(GetWidget()); 928 TooltipManagerAura::UpdateTooltipManagerForCapture(GetWidget());
930 delegate_->OnMouseEvent(event); 929 delegate_->OnMouseEvent(event);
931 } 930 }
932 931
933 void NativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) { 932 void NativeWidgetAura::OnScrollEvent(ui::ScrollEvent* event) {
934 delegate_->OnScrollEvent(event); 933 delegate_->OnScrollEvent(event);
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1215 gfx::NativeView native_view) { 1214 gfx::NativeView native_view) {
1216 aura::client::CaptureClient* capture_client = 1215 aura::client::CaptureClient* capture_client =
1217 aura::client::GetCaptureClient(native_view->GetRootWindow()); 1216 aura::client::GetCaptureClient(native_view->GetRootWindow());
1218 if (!capture_client) 1217 if (!capture_client)
1219 return nullptr; 1218 return nullptr;
1220 return capture_client->GetGlobalCaptureWindow(); 1219 return capture_client->GetGlobalCaptureWindow();
1221 } 1220 }
1222 1221
1223 } // namespace internal 1222 } // namespace internal
1224 } // namespace views 1223 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/test/event_generator_delegate_mac.mm ('k') | ui/views/widget/widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698