Re-lands 58186:

views/controls/combobox/combobox.cc

Index: views/controls/combobox/combobox.cc
diff --git a/views/controls/combobox/combobox.cc b/views/controls/combobox/combobox.cc
index 0c24a0de47b543484f7de767fb0c7d9bffa32807..3eed917ecb8c08c0d01bb886ce005480bd644e64 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;
   }