diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 23:31:37 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 23:31:37 +0000 |
| commit | e833677d6b5a38936bcc2ce455dfe303ce8e0f8b (patch) | |
| tree | 857213b1eeee274deb99a1e7f748b9b7895b3989 /ui/views/controls/tree/tree_view_win.cc | |
| parent | 50bba44020b4848b41f29408688287f3c209770e (diff) | |
| download | chromium_src-e833677d6b5a38936bcc2ce455dfe303ce8e0f8b.zip chromium_src-e833677d6b5a38936bcc2ce455dfe303ce8e0f8b.tar.gz chromium_src-e833677d6b5a38936bcc2ce455dfe303ce8e0f8b.tar.bz2 | |
Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollEvent and DropTargetEvent, in favor of ui::Event derivatives.
http://crbug.com/125937
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10824295
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/tree/tree_view_win.cc')
| -rw-r--r-- | ui/views/controls/tree/tree_view_win.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/views/controls/tree/tree_view_win.cc b/ui/views/controls/tree/tree_view_win.cc index 7480fdd..1688e6c 100644 --- a/ui/views/controls/tree/tree_view_win.cc +++ b/ui/views/controls/tree/tree_view_win.cc @@ -13,6 +13,7 @@ #include "grit/ui_resources.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/accessibility/accessible_view_state.h" +#include "ui/base/events.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util_win.h" @@ -472,7 +473,8 @@ bool TreeView::OnKeyDown(ui::KeyboardCode virtual_key_code) { } else if (virtual_key_code == ui::VKEY_RETURN && !process_enter_) { Widget* widget = GetWidget(); DCHECK(widget); - ui::Accelerator accelerator(virtual_key_code, GetModifiersFromKeyState()); + ui::Accelerator accelerator(virtual_key_code, + ui::GetModifiersFromKeyState()); GetFocusManager()->ProcessAccelerator(accelerator); return true; } |