diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 04:56:36 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 04:56:36 +0000 |
| commit | 8d577a70f6e6d2e47f0ac32f8606e489a7a77998 (patch) | |
| tree | 48eae3f525e0323362db629efa2589e70a5a4e49 /views/controls/combobox | |
| parent | 8fb0ecf45b286845fd2004a157a294d7e3ca7a39 (diff) | |
| download | chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.zip chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.gz chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.bz2 | |
Migrate Event API methods to Google Style.
Re-landing, moving the bits Mac uses to ui/base/events.h
BUG=72040
TEST=none
TBR=sky
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74377
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/combobox')
| -rw-r--r-- | views/controls/combobox/combobox.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc index 0c7f293..2349bbb 100644 --- a/views/controls/combobox/combobox.cc +++ b/views/controls/combobox/combobox.cc @@ -77,7 +77,7 @@ void Combobox::SetEnabled(bool flag) { // VKEY_ESCAPE should be handled by this view when the drop down list is active. // In other words, the list should be closed instead of the dialog. bool Combobox::SkipDefaultKeyEventProcessing(const KeyEvent& e) { - if (e.GetKeyCode() != ui::VKEY_ESCAPE || + if (e.key_code() != ui::VKEY_ESCAPE || e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) { return false; } |