Re-lands 58186:

views/controls/table/group_table_view.h

 // Copyright (c) 2006-2008 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 VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #define VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_
 #pragma once
 
 #include "app/table_model.h"
 #include "base/task.h"
@@ skipping 38 matching lines @@
 
   // Extra-painting required to draw the separator line between groups.
   virtual bool ImplementPostPaint() { return true; }
   virtual void PostPaint(int model_row, int column, bool selected,
                          const gfx::Rect& bounds, HDC device_context);
 
   // In order to make keyboard navigation possible (using the Up and Down
   // keys), we must take action when an arrow key is pressed. The reason we
   // need to process this message has to do with the manner in which the focus
   // needs to be set on a group item when a group is selected.
-  virtual bool OnKeyDown(base::KeyboardCode virtual_keycode);
+  virtual bool OnKeyDown(app::KeyboardCode virtual_keycode);
 
   // Overriden to make sure rows in the same group stay grouped together.
   virtual int CompareRows(int model_row1, int model_row2);
 
   // Updates model_index_to_range_start_map_ from the model.
   virtual void PrepareForSort();
 
  private:
   // Make the selection of group consistent.
   void SyncSelection();
 
   GroupTableModel* model_;
 
   // A factory to make the selection consistent among groups.
   ScopedRunnableMethodFactory<GroupTableView> sync_selection_factory_;
 
   // Maps from model row to start of group.
   std::map<int,int> model_index_to_range_start_map_;
 
   DISALLOW_COPY_AND_ASSIGN(GroupTableView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_TABLE_GROUP_TABLE_VIEW_H_