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

chrome/browser/views/options/cookies_view.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 "chrome/browser/views/options/cookies_view.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
@@ skipping 127 matching lines @@
                                   const std::wstring& new_contents) {
   clear_search_button_->SetEnabled(!search_field_->text().empty());
   search_update_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       search_update_factory_.NewRunnableMethod(
           &CookiesView::UpdateSearchResults), kSearchFilterDelayMs);
 }
 
 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();
   }
   return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, views::DialogDelegate implementation:
 
 std::wstring CookiesView::GetWindowTitle() const {
@@ skipping 67 matching lines @@
   } else if (detailed_info.node_type ==
              CookieTreeNode::DetailedInfo::TYPE_APPCACHE) {
     UpdateVisibleDetailedInfo(appcache_info_view_);
     appcache_info_view_->SetAppCacheInfo(detailed_info.appcache_info);
   } else {
     UpdateVisibleDetailedInfo(cookie_info_view_);
     cookie_info_view_->ClearCookieDisplay();
   }
 }
 
-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();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, public:
 
 void CookiesView::UpdateSearchResults() {
   cookies_tree_model_->UpdateSearchResults(search_field_->text());
   UpdateRemoveButtonsState();
 }
@@ skipping 128 matching lines @@
   remove_all_button_->SetEnabled(cookies_tree_model_->GetRoot()->
       GetTotalNodeCount() > 1);
 }
 
 void CookiesView::UpdateVisibleDetailedInfo(views::View* view) {
   cookie_info_view_->SetVisible(view == cookie_info_view_);
   database_info_view_->SetVisible(view == database_info_view_);
   local_storage_info_view_->SetVisible(view == local_storage_info_view_);
   appcache_info_view_->SetVisible(view == appcache_info_view_);
 }