Re-lands 58186:

chrome/browser/views/options/cookies_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 53 matching lines @@
   virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node) {}
   // End TreeModelObserver implementation.
 
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender, const views::Event& event);
 
   // views::TreeViewController implementation.
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view);
 
   // views::TreeViewController implementation.
-  virtual void OnTreeViewKeyDown(base::KeyboardCode keycode);
+  virtual void OnTreeViewKeyDown(app::KeyboardCode keycode);
 
   // views::Textfield::Controller implementation.
   virtual void ContentsChanged(views::Textfield* sender,
                                const std::wstring& new_contents);
   virtual bool HandleKeystroke(views::Textfield* sender,
                                const views::Textfield::Keystroke& key);
 
   // views::WindowDelegate implementation.
   virtual int GetDialogButtons() const {
     return MessageBoxFlags::DIALOGBUTTON_CANCEL;
@@ skipping 63 matching lines @@
   ScopedRunnableMethodFactory<CookiesView> search_update_factory_;
 
   // Our containing window. If this is non-NULL there is a visible Cookies
   // window somewhere.
   static views::Window* instance_;
 
   DISALLOW_COPY_AND_ASSIGN(CookiesView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_