diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-13 03:07:40 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-13 03:07:40 +0000 |
| commit | 5dfccad3e2ab961303748a33cefce5e7d0a68af8 (patch) | |
| tree | b12c10641ea9df13d82585d01277f76cb9afbf71 | |
| parent | a6fa374a96cd048799d922601d2dd4103b2f1f69 (diff) | |
| download | chromium_src-5dfccad3e2ab961303748a33cefce5e7d0a68af8.zip chromium_src-5dfccad3e2ab961303748a33cefce5e7d0a68af8.tar.gz chromium_src-5dfccad3e2ab961303748a33cefce5e7d0a68af8.tar.bz2 | |
Forwards the mouse wheel events in the notification settings dialog.
Similar to crrev.com/193619, but it will also receive mouse wheel events
so forward them to the scroller.
BUG=230021
Review URL: https://chromiumcodereview.appspot.com/14219002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194083 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/message_center/views/notifier_settings_view.cc | 4 | ||||
| -rw-r--r-- | ui/message_center/views/notifier_settings_view.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index 867d9e7..1c1f0a9 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -343,6 +343,10 @@ bool NotifierSettingsView::OnKeyPressed(const ui::KeyEvent& event) { return scroller_->OnKeyPressed(event); } +bool NotifierSettingsView::OnMouseWheel(const ui::MouseWheelEvent& event) { + return scroller_->OnMouseWheel(event); +} + void NotifierSettingsView::ButtonPressed(views::Button* sender, const ui::Event& event) { std::set<NotifierButton*>::iterator iter = buttons_.find( diff --git a/ui/message_center/views/notifier_settings_view.h b/ui/message_center/views/notifier_settings_view.h index 68db79b..bd2e1b4 100644 --- a/ui/message_center/views/notifier_settings_view.h +++ b/ui/message_center/views/notifier_settings_view.h @@ -63,6 +63,7 @@ class MESSAGE_CENTER_EXPORT NotifierSettingsView virtual gfx::Size GetPreferredSize() OVERRIDE; virtual void OnBlur() OVERRIDE; virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; + virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE; // Overridden from views::ButtonListener: virtual void ButtonPressed(views::Button* sender, |