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

chrome/browser/views/options/cookies_view.cc

Index: chrome/browser/views/options/cookies_view.cc
===================================================================
--- chrome/browser/views/options/cookies_view.cc	(revision 58389)
+++ chrome/browser/views/options/cookies_view.cc	(working copy)
@@ -145,9 +145,9 @@
 
 bool CookiesView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
-  if (key.GetKeyboardCode() == app::VKEY_ESCAPE) {
+  if (key.GetKeyboardCode() == base::VKEY_ESCAPE) {
     ResetSearchQuery();
-  } else if (key.GetKeyboardCode() == app::VKEY_RETURN) {
+  } else if (key.GetKeyboardCode() == base::VKEY_RETURN) {
     search_update_factory_.RevokeAll();
     UpdateSearchResults();
   }
@@ -235,8 +235,8 @@
   }
 }
 
-void CookiesView::OnTreeViewKeyDown(app::KeyboardCode keycode) {
-  if (keycode == app::VKEY_DELETE)
+void CookiesView::OnTreeViewKeyDown(base::KeyboardCode keycode) {
+  if (keycode == base::VKEY_DELETE)
     cookies_tree_->RemoveSelectedItems();
 }