Re-lands 58186:

views/controls/table/native_table_win.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/table/native_table_win.h"
 
 #include <commctrl.h>
 #include <windowsx.h>
 
 #include "app/l10n_util.h"
@@ skipping 445 matching lines @@
 void NativeTableWin::OnDoubleClick() {
   if (!ignore_listview_change_ && table_->observer())
     table_->observer()->OnDoubleClick();
 }
 
 void NativeTableWin::OnMiddleClick() {
   if (!ignore_listview_change_ && table_->observer())
     table_->observer()->OnMiddleClick();
 }
 
-bool NativeTableWin::OnKeyDown(base::KeyboardCode virtual_keycode) {
+bool NativeTableWin::OnKeyDown(app::KeyboardCode virtual_keycode) {
   if (!ignore_listview_change_ && table_->observer())
     table_->observer()->OnKeyDown(virtual_keycode);
   return false;  // Let the key event be processed as ususal.
 }
 
 LRESULT NativeTableWin::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
   switch (draw_info->nmcd.dwDrawStage) {
     case CDDS_PREPAINT: {
       return CDRF_NOTIFYITEMDRAW;
     }
@@ skipping 423 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeButtonWrapper, public:
 
 // static
 NativeTableWrapper* NativeTableWrapper::CreateNativeWrapper(TableView2* table) {
   return new NativeTableWin(table);
 }
 
 }  // namespace views