diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
| commit | 0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch) | |
| tree | 6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /views/controls/combobox/combobox.cc | |
| parent | 3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff) | |
| download | chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2 | |
Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
TBR=bryeung@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
TBR=bryeung@chromium.org
Review URL: http://codereview.chromium.org/3337006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/combobox/combobox.cc')
| -rw-r--r-- | views/controls/combobox/combobox.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc index 3eed917..0c24a0d 100644 --- a/views/controls/combobox/combobox.cc +++ b/views/controls/combobox/combobox.cc @@ -5,7 +5,7 @@ #include "views/controls/combobox/combobox.h" #include "app/combobox_model.h" -#include "app/keyboard_codes.h" +#include "base/keyboard_codes.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "views/controls/combobox/native_combobox_wrapper.h" @@ -75,7 +75,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() != app::VKEY_ESCAPE || + if (e.GetKeyCode() != base::VKEY_ESCAPE || e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) { return false; } |