Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

views/controls/combobox/combobox.cc

Index: views/controls/combobox/combobox.cc
===================================================================
--- views/controls/combobox/combobox.cc	(revision 58389)
+++ views/controls/combobox/combobox.cc	(working copy)
@@ -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 @@
 // 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;
   }