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

ui/views/controls/table/table_view_unittest.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 "base/macros.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 33 matching lines @@
   }
 
  private:
   TableView* table_;
 
   DISALLOW_COPY_AND_ASSIGN(TableViewTestHelper);
 };
 
 namespace {
 
+#if defined(OS_MACOSX)
+constexpr int kCtrlOrCmdMask = ui::EF_COMMAND_DOWN;
+#else
+constexpr int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN;
+#endif
+
 // TestTableModel2 -------------------------------------------------------------
 
 // Trivial TableModel implementation that is backed by a vector of vectors.
 // Provides methods for adding/removing/changing the contents that notify the
 // observer appropriately.
 //
 // Initial contents are:
 // 0, 1
 // 1, 1
 // 2, 2
@@ skipping 133 matching lines @@
     columns[0].sortable = true;
     columns[1].title = base::ASCIIToUTF16("Title Column 1");
     columns[1].id = 1;
     columns[1].sortable = true;
     table_ = new TableView(model_.get(), columns, TEXT_ONLY, false);
     View* parent = table_->CreateParentIfNecessary();
     parent->SetBounds(0, 0, 10000, 10000);
     parent->Layout();
     helper_.reset(new TableViewTestHelper(table_));
 
-    Widget::InitParams params =
-        CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+    Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.bounds = gfx::Rect(0, 0, 650, 650);
     widget_.reset(new Widget);
     widget_->Init(params);
     widget_->GetContentsView()->AddChildView(parent);
     widget_->Show();
   }
 
   void TearDown() override {
     widget_.reset();
     ViewsTestBase::TearDown();
   }
 
   void ClickOnRow(int row, int flags) {
     ui::test::EventGenerator generator(widget_->GetNativeWindow());
+    generator.set_assume_window_at_origin(false);
     generator.set_flags(flags);
     generator.set_current_location(GetPointForRow(row));
     generator.PressLeftButton();
   }
 
   void TapOnRow(int row) {
     ui::test::EventGenerator generator(widget_->GetNativeWindow());
     generator.GestureTapAt(GetPointForRow(row));
   }
 
@@ skipping 712 matching lines @@
   ClickOnRow(4, 0);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=4 anchor=4 selection=3 4", SelectionStateAsString());
 
   // Shift click on the third row, should extend selection to it.
   ClickOnRow(2, ui::EF_SHIFT_DOWN);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=2 anchor=4 selection=2 3 4", SelectionStateAsString());
 
   // Control click on third row, should toggle it.
-  ClickOnRow(2, ui::EF_CONTROL_DOWN);
+  ClickOnRow(2, kCtrlOrCmdMask);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=2 anchor=2 selection=3 4", SelectionStateAsString());
 
   // Control-shift click on second row, should extend selection to it.
-  ClickOnRow(1, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN);
+  ClickOnRow(1, kCtrlOrCmdMask | ui::EF_SHIFT_DOWN);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=1 anchor=2 selection=0 1 2 3 4", SelectionStateAsString());
 
   // Click on last row again.
   ClickOnRow(4, 0);
   EXPECT_EQ(1, observer.GetChangedCountAndClear());
   EXPECT_EQ("active=4 anchor=4 selection=3 4", SelectionStateAsString());
 
   table_->set_observer(NULL);
 }
@@ skipping 52 matching lines @@
   new_selection.AddIndexToSelection(0);
   new_selection.AddIndexToSelection(1);
   new_selection.set_active(0);
   new_selection.set_anchor(0);
   helper_->SetSelectionModel(new_selection);
   model_->RemoveRow(0);
   table_->RequestFocus();
 }
 
 }  // namespace views