Index: chrome/browser/views/tabs/tab_dragging_test.cc |
=================================================================== |
--- chrome/browser/views/tabs/tab_dragging_test.cc (revision 26702) |
+++ chrome/browser/views/tabs/tab_dragging_test.cc (working copy) |
@@ -103,12 +103,9 @@ |
// | Tab_1 | |
// ---- ---- ---- |
- POINT start; |
- POINT end; |
- start.x = bounds1.x() + bounds1.width()/2; |
- start.y = bounds1.y() + bounds1.height()/2; |
- end.x = start.x + 2*bounds1.width()/3; |
- end.y = start.y; |
+ gfx::Point start(bounds1.x() + bounds1.width() / 2, |
+ bounds1.y() + bounds1.height() / 2); |
+ gfx::Point end(start.x() + 2 * bounds1.width() / 3, start.y()); |
ASSERT_TRUE(browser->SimulateDrag(start, end, |
views::Event::EF_LEFT_BUTTON_DOWN, |
false)); |
@@ -204,12 +201,11 @@ |
// | Tab_1 | |
// ---- ---- ---- |
- POINT start; |
- POINT end; |
- start.x = bounds1.x() + bounds1.width()/2; |
- start.y = bounds1.y() + bounds1.height()/2; |
- end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2; |
- end.y = start.y; |
+ gfx::Point start(bounds1.x() + bounds1.width() / 2, |
+ bounds1.y() + bounds1.height() / 2); |
+ gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() + |
+ bounds3.width() / 2, |
+ start.y()); |
ASSERT_TRUE(browser->SimulateDrag(start, end, |
views::Event::EF_LEFT_BUTTON_DOWN, |
false)); |
@@ -312,12 +308,11 @@ |
// | Tab_1 | |
// ---- ---- ---- |
- POINT start; |
- POINT end; |
- start.x = bounds1.x() + bounds1.width()/2; |
- start.y = bounds1.y() + bounds1.height()/2; |
- end.x = start.x + bounds1.width()/2 + bounds2.width() + bounds3.width()/2; |
- end.y = start.y; |
+ gfx::Point start(bounds1.x() + bounds1.width() / 2, |
+ bounds1.y() + bounds1.height() / 2); |
+ gfx::Point end(start.x() + bounds1.width() / 2 + bounds2.width() + |
+ bounds3.width() / 2, |
+ start.y()); |
// Simulate drag with 'true' as the last parameter. This will interrupt |
// in-flight with Escape. |
@@ -435,12 +430,10 @@ |
// | Tab_2 | (New Window) |
// ---- ---- ---- ---- ---- ---- ---- |
- POINT start; |
- POINT end; |
- start.x = bounds2.x() + bounds2.width()/2; |
- start.y = bounds2.y() + bounds2.height()/2; |
- end.x = start.x; |
- end.y = start.y + 3*urlbar_bounds.height(); |
+ gfx::Point start(bounds2.x() + bounds2.width() / 2, |
+ bounds2.y() + bounds2.height() / 2); |
+ gfx::Point end(start.x(), |
+ start.y() + 3 * urlbar_bounds.height()); |
// Simulate tab drag. |
ASSERT_TRUE(browser->SimulateDrag(start, end, |