summaryrefslogtreecommitdiffstats
path: root/chrome/test/automated_ui_tests
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-10 04:56:36 +0000
commit8d577a70f6e6d2e47f0ac32f8606e489a7a77998 (patch)
tree48eae3f525e0323362db629efa2589e70a5a4e49 /chrome/test/automated_ui_tests
parent8fb0ecf45b286845fd2004a157a294d7e3ca7a39 (diff)
downloadchromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.zip
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.gz
chromium_src-8d577a70f6e6d2e47f0ac32f8606e489a7a77998.tar.bz2
Migrate Event API methods to Google Style.
Re-landing, moving the bits Mac uses to ui/base/events.h BUG=72040 TEST=none TBR=sky Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=74377 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automated_ui_tests')
-rw-r--r--chrome/test/automated_ui_tests/automated_ui_test_base.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index f5cad88..e282256 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -10,9 +10,9 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/automation/window_proxy.h"
#include "chrome/test/ui/ui_test.h"
+#include "ui/base/events.h"
#include "ui/gfx/point.h"
#include "ui/gfx/rect.h"
-#include "views/events/event.h"
AutomatedUITestBase::AutomatedUITestBase() {}
@@ -139,8 +139,7 @@ bool AutomatedUITestBase::DragTabOut() {
end.set_x(start.x());
end.set_y(start.y() + 3 * urlbar_bounds.height());
- if (!browser->SimulateDrag(start, end, views::Event::EF_LEFT_BUTTON_DOWN,
- false)) {
+ if (!browser->SimulateDrag(start, end, ui::EF_LEFT_BUTTON_DOWN, false)) {
LogWarningMessage("failed_to_simulate_drag");
return false;
}
@@ -208,7 +207,7 @@ bool AutomatedUITestBase::DragActiveTab(bool drag_right) {
}
if (!browser->SimulateDrag(dragged_tab_point, destination_point,
- views::Event::EF_LEFT_BUTTON_DOWN, false)) {
+ ui::EF_LEFT_BUTTON_DOWN, false)) {
LogWarningMessage("failed_to_simulate_drag");
return false;
}