MacViews: Fix some TableView tests, add ui::EventGenerator::set_assume_window_at_origin(bool)

ui/views/controls/table/table_view.cc

 // Copyright (c) 2012 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 "ui/views/controls/table/table_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 57 matching lines @@
       ui::NativeTheme::kColorId_TableSelectionBackgroundFocused :
       ui::NativeTheme::kColorId_TableSelectionBackgroundUnfocused;
 }
 
 // Returns the color id for text. |has_focus| indicates if the table has focus.
 ui::NativeTheme::ColorId selected_text_color_id(bool has_focus) {
   return has_focus ? ui::NativeTheme::kColorId_TableSelectedText :
       ui::NativeTheme::kColorId_TableSelectedTextUnfocused;
 }
 
+// Whether the platform "command" key is down.
+bool IsCmdOrCtrl(const ui::Event& event) {
+#if defined(OS_MACOSX)
+  return event.IsCommandDown();
+#else
+  return event.IsControlDown();
+#endif
+}
+
 } // namespace
 
 // Used as the comparator to sort the contents of the table.
 struct TableView::SortHelper {
   explicit SortHelper(TableView* table) : table(table) {}
 
   bool operator()(int model_index1, int model_index2) {
     return table->CompareRows(model_index1, model_index2) < 0;
   }
 
@@ skipping 255 matching lines @@
   return gfx::Size(width, RowCount() * row_height_);
 }
 
 bool TableView::OnKeyPressed(const ui::KeyEvent& event) {
   if (!HasFocus())
     return false;
 
   switch (event.key_code()) {
     case ui::VKEY_A:
       // control-a selects all.
-      if (event.IsControlDown() && !single_selection_ && RowCount()) {
+      if (IsCmdOrCtrl(event) && !single_selection_ && RowCount()) {
         ui::ListSelectionModel selection_model;
         selection_model.SetSelectedIndex(selection_model_.active());
         for (int i = 0; i < RowCount(); ++i)
           selection_model.AddIndexToSelection(i);
         SetSelectionModel(selection_model);
         return true;
       }
       break;
 
     case ui::VKEY_HOME:
@@ skipping 489 matching lines @@
     view_index = std::min(RowCount() - 1, view_index + 1);
   SelectByViewIndex(view_index);
 }
 
 void TableView::ConfigureSelectionModelForEvent(
     const ui::LocatedEvent& event,
     ui::ListSelectionModel* model) const {
   const int view_index = event.y() / row_height_;
   DCHECK(view_index >= 0 && view_index < RowCount());
 
-  if (selection_model_.anchor() == -1 ||
-      single_selection_ ||
-      (!event.IsControlDown() && !event.IsShiftDown())) {
+  if (selection_model_.anchor() == -1 || single_selection_ ||
+      (!IsCmdOrCtrl(event) && !event.IsShiftDown())) {
     SelectRowsInRangeFrom(view_index, true, model);
     model->set_anchor(ViewToModel(view_index));
     model->set_active(ViewToModel(view_index));
     return;
   }
-  if ((event.IsControlDown() && event.IsShiftDown()) || event.IsShiftDown()) {
+  if ((IsCmdOrCtrl(event) && event.IsShiftDown()) || event.IsShiftDown()) {
     // control-shift: copy existing model and make sure rows between anchor and
     // |view_index| are selected.
     // shift: reset selection so that only rows between anchor and |view_index|
     // are selected.
-    if (event.IsControlDown() && event.IsShiftDown())
+    if (IsCmdOrCtrl(event) && event.IsShiftDown())
       model->Copy(selection_model_);
     else
       model->set_anchor(selection_model_.anchor());
     for (int i = std::min(view_index, ModelToView(model->anchor())),
              end = std::max(view_index, ModelToView(model->anchor()));
          i <= end; ++i) {
       SelectRowsInRangeFrom(i, true, model);
     }
     model->set_active(ViewToModel(view_index));
   } else {
-    DCHECK(event.IsControlDown());
+    DCHECK(IsCmdOrCtrl(event));
     // Toggle the selection state of |view_index| and set the anchor/active to
     // it and don't change the state of any other rows.
     model->Copy(selection_model_);
     model->set_anchor(ViewToModel(view_index));
     model->set_active(ViewToModel(view_index));
     SelectRowsInRangeFrom(view_index,
                           !model->IsSelected(ViewToModel(view_index)),
                           model);
   }
 }
@@ skipping 49 matching lines @@
   if (tooltip)
     *tooltip = text;
   if (tooltip_origin) {
     tooltip_origin->SetPoint(cell_bounds.x(),
                              cell_bounds.y() + kTextVerticalPadding);
   }
   return true;
 }
 
 }  // namespace views