Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: views/controls/combobox/combobox.cc

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/button/native_button.cc ('k') | views/controls/link.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/combobox/combobox.cc
===================================================================
--- views/controls/combobox/combobox.cc (revision 71220)
+++ views/controls/combobox/combobox.cc (working copy)
@@ -5,9 +5,9 @@
#include "views/controls/combobox/combobox.h"
#include "app/combobox_model.h"
-#include "app/keyboard_codes.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/controls/combobox/native_combobox_wrapper.h"
#include "views/controls/native/native_view_host.h"
@@ -75,7 +75,7 @@
// 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() != ui::VKEY_ESCAPE ||
e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) {
return false;
}
« no previous file with comments | « views/controls/button/native_button.cc ('k') | views/controls/link.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698