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

views/controls/combobox/combobox.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "views/controls/native/native_view_host.h"
 
 namespace views {
 
 // static
 const char Combobox::kViewClassName[] = "views/Combobox";
 
@@ skipping 49 matching lines @@
 
 void Combobox::SetEnabled(bool flag) {
   View::SetEnabled(flag);
   if (native_wrapper_)
     native_wrapper_->UpdateEnabled();
 }
 
 // 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;
   }
   return native_wrapper_ && native_wrapper_->IsDropdownOpen();
 }
 
 void Combobox::PaintFocusBorder(gfx::Canvas* canvas) {
   if (NativeViewHost::kRenderNativeControlFocus)
     View::PaintFocusBorder(canvas);
 }
@@ skipping 27 matching lines @@
     native_wrapper_ = NativeComboboxWrapper::CreateWrapper(this);
     AddChildView(native_wrapper_->GetView());
   }
 }
 
 std::string Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views