diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 21:41:07 +0000 |
| commit | f8d74230b839def072f26049845bd9003d87eb26 (patch) | |
| tree | 7d5ecb668377162dab0260e7fe107018115b904e /chrome/test | |
| parent | 2212d27f2cc41983901f45299cda82d704c76e82 (diff) | |
| download | chromium_src-f8d74230b839def072f26049845bd9003d87eb26.zip chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.gz chromium_src-f8d74230b839def072f26049845bd9003d87eb26.tar.bz2 | |
Rename ui::EventFlags mouse flags to be more sensible
Changes EF_(LEFT|MIDDLE|RIGHT)_BUTTON_DOWN to
EF_(LEF|MIDDLE|RIGHT)_MOUSE_BUTTON since these are not
specific to "down" button events.
This is follow up from review http://codereview.chromium.org/8953037
BUG=none
TEST=Compiles.
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9007016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/automation/automation_proxy_uitest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/reliability/automated_ui_test_base.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/history_uitest.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 8a1158d6..ebfe25e 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -199,7 +199,7 @@ TEST_F(AutomationProxyVisibleTest, MAYBE_WindowGetViewBounds) { start.y = bounds.y() + bounds.height() / 2; end.x = start.x + 2 * bounds.width() / 3; end.y = start.y; - ASSERT_TRUE(browser->SimulateDrag(start, end, ui::EF_LEFT_BUTTON_DOWN)); + ASSERT_TRUE(browser->SimulateDrag(start, end, ui::EF_LEFT_MOUSE_BUTTON)); // Check to see that the drag event successfully swapped the two tabs. tab1 = browser->GetTab(0); diff --git a/chrome/test/reliability/automated_ui_test_base.cc b/chrome/test/reliability/automated_ui_test_base.cc index 95a93c8..87a3311 100644 --- a/chrome/test/reliability/automated_ui_test_base.cc +++ b/chrome/test/reliability/automated_ui_test_base.cc @@ -141,7 +141,7 @@ bool AutomatedUITestBase::DragTabOut() { end.set_x(start.x()); end.set_y(start.y() + 3 * urlbar_bounds.height()); - if (!browser->SimulateDrag(start, end, ui::EF_LEFT_BUTTON_DOWN, false)) { + if (!browser->SimulateDrag(start, end, ui::EF_LEFT_MOUSE_BUTTON, false)) { LogWarningMessage("failed_to_simulate_drag"); return false; } @@ -209,7 +209,7 @@ bool AutomatedUITestBase::DragActiveTab(bool drag_right) { } if (!browser->SimulateDrag(dragged_tab_point, destination_point, - ui::EF_LEFT_BUTTON_DOWN, false)) { + ui::EF_LEFT_MOUSE_BUTTON, false)) { LogWarningMessage("failed_to_simulate_drag"); return false; } diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc index ea08d20..f0dfb10 100644 --- a/chrome/test/ui/history_uitest.cc +++ b/chrome/test/ui/history_uitest.cc @@ -111,7 +111,7 @@ TEST_F(HistoryTester, ConsiderRedirectAfterGestureAsUserInitiated) { ASSERT_TRUE(window->GetViewBounds(VIEW_ID_TAB_CONTAINER, &tab_view_bounds, true)); ASSERT_TRUE(window->SimulateOSClick(tab_view_bounds.CenterPoint(), - ui::EF_LEFT_BUTTON_DOWN)); + ui::EF_LEFT_MOUSE_BUTTON)); NavigateToURL(GURL("javascript:redirectToPage12()")); WaitForFinish("History_Length_Test_12", "1", url, kTestCompleteCookie, |