diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-01 16:39:26 +0000 |
| commit | 1eed61535cb6e15015edac43177ccdc25140855a (patch) | |
| tree | 843a3c3b42bfaadc54cd6c835e4c313965a0e177 /views/controls/combobox | |
| parent | de6aadf4ddf69c76ddd60e03451fdbcb4061283f (diff) | |
| download | chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.zip chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.gz chromium_src-1eed61535cb6e15015edac43177ccdc25140855a.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/combobox')
| -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 0c24a0d..3eed917 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 "base/keyboard_codes.h" +#include "app/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() != base::VKEY_ESCAPE || + if (e.GetKeyCode() != app::VKEY_ESCAPE || e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) { return false; } |