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

views/controls/table/group_table_view.cc

 // 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.
 
 #include "views/controls/table/group_table_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "gfx/canvas.h"
@@ skipping 43 matching lines @@
         for (int i = group_range.start;
              i < group_range.start + group_range.length; ++i) {
           SetSelectedState(i, true);
         }
       }
       index += group_range.length;
     }
   }
 }
 
-bool GroupTableView::OnKeyDown(app::KeyboardCode virtual_keycode) {
+bool GroupTableView::OnKeyDown(base::KeyboardCode virtual_keycode) {
   // In a list view, multiple items can be selected but only one item has the
   // focus. This creates a problem when the arrow keys are used for navigating
   // between items in the list view. An example will make this more clear:
   //
   // Suppose we have 5 items in the list view, and three of these items are
   // part of one group:
   //
   // Index0: ItemA (No Group)
   // Index1: ItemB (GroupX)
   // Index2: ItemC (GroupX)
   // Index3: ItemD (GroupX)
   // Index4: ItemE (No Group)
   //
   // When GroupX is selected (say, by clicking on ItemD with the mouse),
   // GroupTableView::SyncSelection() will make sure ItemB, ItemC and ItemD are
   // selected. Also, the item with the focus will be ItemD (simply because
   // this is the item the user happened to click on). If then the UP arrow is
   // pressed once, the focus will be switched to ItemC and not to ItemA and the
   // end result is that we are stuck in GroupX even though the intention was to
   // switch to ItemA.
   //
   // For that exact reason, we need to set the focus appropriately when we
   // detect that one of the arrow keys is pressed. Thus, when it comes time
   // for the list view control to actually switch the focus, the right item
   // will be selected.
-  if ((virtual_keycode != app::VKEY_UP) &&
-      (virtual_keycode != app::VKEY_DOWN)) {
+  if ((virtual_keycode != base::VKEY_UP) &&
+      (virtual_keycode != base::VKEY_DOWN)) {
     return TableView::OnKeyDown(virtual_keycode);
   }
 
   // We start by finding the index of the item with the focus. If no item
   // currently has the focus, then this routine doesn't do anything.
   int focused_index;
   int row_count = model_->RowCount();
   for (focused_index = 0; focused_index < row_count; focused_index++) {
     if (ItemHasTheFocus(focused_index)) {
       break;
     }
   }
 
   if (focused_index == row_count)
     return false;
 
   DCHECK_LT(focused_index, row_count);
 
   // Nothing to do if the item which has the focus is not part of a group.
   GroupRange group_range;
   model_->GetGroupRangeForItem(focused_index, &group_range);
   if (group_range.length == 1)
     return false;
 
   // If the user pressed the UP key, then the focus should be set to the
   // topmost element in the group. If the user pressed the DOWN key, the focus
   // should be set to the bottommost element.
-  if (virtual_keycode == app::VKEY_UP) {
+  if (virtual_keycode == base::VKEY_UP) {
     SetFocusOnItem(group_range.start);
   } else {
-    DCHECK_EQ(virtual_keycode, app::VKEY_DOWN);
+    DCHECK_EQ(virtual_keycode, base::VKEY_DOWN);
     SetFocusOnItem(group_range.start + group_range.length - 1);
   }
 
   return false;
 }
 
 void GroupTableView::PrepareForSort() {
   GroupRange range;
   int row_count = RowCount();
   model_index_to_range_start_map_.clear();
@@ skipping 53 matching lines @@
   }
   SelectObject(hdc, hPenOld);
   DeleteObject(hPen);
 }
 
 std::string GroupTableView::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views